Merge pull request #7590 from Rmys/master

qt5 build deb

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 <libio.h>', '')
+    
     shelltools.system("find ./ -name \*.sh -print0 | xargs -0 chmod +x")
     for d in ("btyacc", "editline", "icu"):
         shelltools.unlinkDir("extern/%s" % d)

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");

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 <libio.h>
+-#endif
+-
+ #ifdef HAVE_TIMES
+ #include <sys/types.h>
+ #include <sys/times.h>
+

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 <libio.h>
+ #endif
+ 

server/database/firebird/pspec.xml

@@ -34,6 +34,8 @@
             <!--Patch level="1">Provide-sized-global-delete-operators-when-compiled.patch</Patch>
             <Patch level="1">Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch</Patch>
             <Patch level="1">Firebird-gcc-icu.patch</Patch-->
+            <Patch>006-musl-glibc.patch</Patch>
+            <Patch>007-libio.patch</Patch>
         </Patches>
     </Source>