From efdf279b99a9975bc47a157884d5ea17a3477e84 Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 16 Jan 2020 21:28:41 +0300 Subject: [PATCH] qt5 build deb --- server/database/firebird/actions.py | 3 +++ .../database/firebird/files/006-musl-glibc.patch | 11 +++++++++++ server/database/firebird/files/007-libio.patch | 14 ++++++++++++++ .../database/firebird/files/007-musl-libio.patch | 11 +++++++++++ server/database/firebird/pspec.xml | 2 ++ 5 files changed, 41 insertions(+) create mode 100644 server/database/firebird/files/006-musl-glibc.patch create mode 100644 server/database/firebird/files/007-libio.patch create mode 100644 server/database/firebird/files/007-musl-libio.patch diff --git a/server/database/firebird/actions.py b/server/database/firebird/actions.py index 80692960a4..b04538a95e 100644 --- a/server/database/firebird/actions.py +++ b/server/database/firebird/actions.py @@ -20,6 +20,9 @@ def setup(): pisitools.dosed("src/msgs/history2.sql", 'isql\s', 'fbsql ') pisitools.dosed("src/msgs/messages2.sql", 'isql\s', 'fbsql ') pisitools.dosed("src/msgs/messages2.sql", 'ISQL\s', 'FBSQL ') + + #pisitools.dosed("src/jrd/perf.h", '#include ', '') + shelltools.system("find ./ -name \*.sh -print0 | xargs -0 chmod +x") for d in ("btyacc", "editline", "icu"): shelltools.unlinkDir("extern/%s" % d) diff --git a/server/database/firebird/files/006-musl-glibc.patch b/server/database/firebird/files/006-musl-glibc.patch new file mode 100644 index 0000000000..68b451d16e --- /dev/null +++ b/server/database/firebird/files/006-musl-glibc.patch @@ -0,0 +1,11 @@ +--- src/common/classes/rwlock.h 2015-03-27 14:47:01.000000000 +0100 ++++ src/common/classes/rwlock.h 2016-02-24 15:11:46.043602883 +0100 +@@ -191,7 +191,7 @@ + + void init() + { +-#if defined(LINUX) && !defined(USE_VALGRIND) ++#if defined(LINUX) && defined(__GLIBC__) && !defined(USE_VALGRIND) + pthread_rwlockattr_t attr; + if (pthread_rwlockattr_init(&attr)) + system_call_failed::raise("pthread_rwlockattr_init"); diff --git a/server/database/firebird/files/007-libio.patch b/server/database/firebird/files/007-libio.patch new file mode 100644 index 0000000000..af8bd0efc2 --- /dev/null +++ b/server/database/firebird/files/007-libio.patch @@ -0,0 +1,14 @@ +--- src/jrd/perf.h 2018-01-05 ++++ src/jrd/perf.h 2018-08-20 +@@ -31,10 +31,6 @@ + #ifndef JRD_PERF_H + #define JRD_PERF_H + +-#ifdef LINUX +-#include +-#endif +- + #ifdef HAVE_TIMES + #include + #include + diff --git a/server/database/firebird/files/007-musl-libio.patch b/server/database/firebird/files/007-musl-libio.patch new file mode 100644 index 0000000000..cb74e9b5c8 --- /dev/null +++ b/server/database/firebird/files/007-musl-libio.patch @@ -0,0 +1,11 @@ +--- src/jrd/perf.h 2015-03-27 14:46:58.000000000 +0100 ++++ src/jrd/perf.h 2016-02-24 15:38:06.674716837 +0100 +@@ -31,7 +31,7 @@ + #ifndef JRD_PERF_H + #define JRD_PERF_H + +-#ifdef LINUX ++#if defined(LINUX) && defined(__GLIBC__) + #include + #endif + diff --git a/server/database/firebird/pspec.xml b/server/database/firebird/pspec.xml index b327b0a1f4..28a907ba3d 100644 --- a/server/database/firebird/pspec.xml +++ b/server/database/firebird/pspec.xml @@ -34,6 +34,8 @@ + 006-musl-glibc.patch + 007-libio.patch