From: Bartek Szady Date: Tue, 27 Feb 2024 13:28:09 +0000 (+0100) Subject: - updated to 5.0.0.1306 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2FFirebird.git;a=commitdiff_plain;h=1856fc6394a8dae78fdbb616a587b3a19c09e43b - updated to 5.0.0.1306 --- diff --git a/Firebird-gcc-icu.patch b/Firebird-gcc-icu.patch deleted file mode 100644 index c5c0814..0000000 --- a/Firebird-gcc-icu.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/src/common/classes/alloc.h Firebird-3.0.7.33374-0/src/common/classes/alloc.h ---- Firebird-3.0.7.33374-0.org/src/common/classes/alloc.h 2020-10-20 08:40:05.000000000 +0000 -+++ Firebird-3.0.7.33374-0/src/common/classes/alloc.h 2022-04-04 17:51:33.923548962 +0000 -@@ -55,6 +55,7 @@ - #else - #include - #endif -+#include - - #include - diff --git a/Firebird-libpath.patch b/Firebird-libpath.patch index e2c6a61..42071cd 100644 --- a/Firebird-libpath.patch +++ b/Firebird-libpath.patch @@ -1,8 +1,9 @@ ---- Firebird-3.0.0.32483-0/builds/posix/Makefile.in.orig 2016-04-14 16:07:29.000000000 +0200 -+++ Firebird-3.0.0.32483-0/builds/posix/Makefile.in 2016-09-01 21:59:46.720043484 +0200 -@@ -315,7 +315,7 @@ +diff -up Firebird-5.0.0.1306-0-source/builds/posix/Makefile.in._orig Firebird-5.0.0.1306-0-source/builds/posix/Makefile.in +--- Firebird-5.0.0.1306-0-source/builds/posix/Makefile.in._orig 2024-02-22 09:14:30.430893458 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/Makefile.in 2024-02-22 09:17:31.106365442 +0100 +@@ -495,7 +495,7 @@ SECURITY_TMP = security.tmp - databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB) + databases: yachts.lnk $(SECURITY_FDB) -export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(FIREBIRD)/lib +export LD_LIBRARY_PATH := $(FIREBIRD)/lib:$(LD_LIBRARY_PATH) diff --git a/Firebird-opt.patch b/Firebird-opt.patch index e569aba..6c8a8d8 100644 --- a/Firebird-opt.patch +++ b/Firebird-opt.patch @@ -1,6 +1,6 @@ -diff -up Firebird-4.0.4.3010-0/builds/posix/prefix.linux.orig Firebird-4.0.4.3010-0/builds/posix/prefix.linux ---- Firebird-4.0.4.3010-0/builds/posix/prefix.linux.orig 2023-12-20 10:35:28.286426711 +0100 -+++ Firebird-4.0.4.3010-0/builds/posix/prefix.linux 2023-12-20 10:39:45.031472876 +0100 +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux._orig 2024-02-22 08:37:49.342919440 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux 2024-02-22 08:47:40.412106924 +0100 @@ -18,8 +18,8 @@ # # 2 Oct 2002, Nickolay Samofatov - Major cleanup @@ -9,12 +9,12 @@ diff -up Firebird-4.0.4.3010-0/builds/posix/prefix.linux.orig Firebird-4.0.4.301 -OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer +COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 +OPTIMIZE_FLAGS=-fno-omit-frame-pointer - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing -Wno-unused-local-typedefs + WARN_FLAGS=-Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing -Wno-unused-local-typedefs PLATFORM_PLUSPLUS_FLAGS=-Wno-invalid-offsetof -Wno-class-memaccess -diff -up Firebird-4.0.4.3010-0/builds/posix/prefix.linux_amd64.orig Firebird-4.0.4.3010-0/builds/posix/prefix.linux_amd64 ---- Firebird-4.0.4.3010-0/builds/posix/prefix.linux_amd64.orig 2023-12-20 10:35:28.286426711 +0100 -+++ Firebird-4.0.4.3010-0/builds/posix/prefix.linux_amd64 2023-12-20 10:40:32.344507488 +0100 +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_amd64._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_amd64 +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_amd64._orig 2024-02-22 08:37:49.342919440 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_amd64 2024-02-22 08:49:50.947915307 +0100 @@ -18,8 +18,8 @@ # # 2 Oct 2002, Nickolay Samofatov - Major cleanup @@ -23,12 +23,12 @@ diff -up Firebird-4.0.4.3010-0/builds/posix/prefix.linux_amd64.orig Firebird-4.0 -OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer +COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 +OPTIMIZE_FLAGS=-fno-omit-frame-pointer - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing -Wno-unused-local-typedefs + WARN_FLAGS=-Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing -Wno-unused-local-typedefs PLATFORM_PLUSPLUS_FLAGS=-Wno-invalid-offsetof -Wno-class-memaccess - -diff -up Firebird-4.0.4.3010-0/builds/posix/prefix.linux_arm.orig Firebird-4.0.4.3010-0/builds/posix/prefix.linux_arm ---- Firebird-4.0.4.3010-0/builds/posix/prefix.linux_arm.orig 2023-12-20 10:35:28.289760024 +0100 -+++ Firebird-4.0.4.3010-0/builds/posix/prefix.linux_arm 2023-12-20 10:43:51.513249902 +0100 + #VALGRIND_FLAGS=-DUSE_VALGRIND +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm._orig 2024-02-22 08:37:49.342919440 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm 2024-02-22 08:51:24.290642044 +0100 @@ -20,7 +20,7 @@ #LD=@CXX@ @@ -37,23 +37,23 @@ diff -up Firebird-4.0.4.3010-0/builds/posix/prefix.linux_arm.orig Firebird-4.0.4 +COMMON_FLAGS=@CFLAGS@ -DLINUX -DARM -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 -DFB_SEND_FLAGS=MSG_NOSIGNAL -PROD_FLAGS=$(COMMON_FLAGS) -O3 --DEV_FLAGS=$(COMMON_FLAGS) -p -ggdb -Wall -Wno-non-virtual-dtor +-DEV_FLAGS=$(COMMON_FLAGS) -p -ggdb -Werror=delete-incomplete -Wall -Wno-non-virtual-dtor +PROD_FLAGS=$(COMMON_FLAGS) -+DEV_FLAGS=$(COMMON_FLAGS) -Wall -Wno-non-virtual-dtor -diff -up Firebird-4.0.4.3010-0/builds/posix/prefix.linux_arm64.orig Firebird-4.0.4.3010-0/builds/posix/prefix.linux_arm64 ---- Firebird-4.0.4.3010-0/builds/posix/prefix.linux_arm64.orig 2023-12-20 10:35:28.289760024 +0100 -+++ Firebird-4.0.4.3010-0/builds/posix/prefix.linux_arm64 2023-12-20 10:45:06.012779501 +0100 ++DEV_FLAGS=$(COMMON_FLAGS) -Werror=delete-incomplete -Wall -Wno-non-virtual-dtor +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm64._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm64 +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm64._orig 2024-02-22 08:37:49.342919440 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_arm64 2024-02-22 09:08:58.709795676 +0100 @@ -23,5 +23,5 @@ #PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC - #DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch + #DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -PROD_FLAGS=-O3 -DLINUX -DARM64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 --DEV_FLAGS=-ggdb -DLINUX -DARM64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor +-DEV_FLAGS=-ggdb -DLINUX -DARM64 -pipe -p -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor +PROD_FLAGS=@CFLAGS@ -DLINUX -DARM64 -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 -+DEV_FLAGS=@CFLAGS@ -DLINUX -DARM64 -pipe -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor -diff -up Firebird-4.0.4.3010-0/builds/posix/prefix.linux_generic.orig Firebird-4.0.4.3010-0/builds/posix/prefix.linux_generic ---- Firebird-4.0.4.3010-0/builds/posix/prefix.linux_generic.orig 2023-12-20 10:35:28.289760024 +0100 -+++ Firebird-4.0.4.3010-0/builds/posix/prefix.linux_generic 2023-12-20 10:45:58.629113926 +0100 ++DEV_FLAGS=@CFLAGS@ -DLINUX -DARM64 -pipe -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_generic._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_generic +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_generic._orig 2024-02-22 08:37:49.342919440 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_generic 2024-02-22 08:54:40.156050585 +0100 @@ -18,7 +18,7 @@ # # 2 Oct 2002, Nickolay Samofatov - Major cleanup @@ -62,93 +62,71 @@ diff -up Firebird-4.0.4.3010-0/builds/posix/prefix.linux_generic.orig Firebird-4 +COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -PROD_FLAGS=-ggdb -O3 $(COMMON_FLAGS) --DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor +-DEV_FLAGS=-ggdb -p -Werror=delete-incomplete -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor +PROD_FLAGS=$(COMMON_FLAGS) -+DEV_FLAGS=-Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor ---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_ia64.orig 2016-08-31 20:27:07.857760158 +0200 -+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_ia64 2016-08-31 20:55:10.367740946 +0200 -@@ -18,8 +18,8 @@ - # 2 Oct 2002, Nickolay Samofatov - Major cleanup - # Adriano dos Santos Fernandes - IA-64 port - --COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DIA64 -pipe -MMD -fPIC -fmessage-length=0 --OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer -+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DIA64 -pipe -MMD -fPIC -fmessage-length=0 -+OPTIMIZE_FLAGS=-fno-omit-frame-pointer - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor - - PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS) ---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mips.orig 2016-08-31 20:27:07.857760158 +0200 -+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mips 2016-08-31 20:56:05.504406983 +0200 -@@ -1,5 +1,5 @@ ++DEV_FLAGS=-Werror=delete-incomplete -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mips._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mips +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mips._orig 2024-02-22 08:37:49.342919440 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mips 2024-02-22 08:57:58.424615561 +0100 +@@ -1,7 +1,7 @@ -COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer -fno-builtin +COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 +OPTIMIZE_FLAGS=-fno-omit-frame-pointer -fno-builtin - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor + WARN_FLAGS=-Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS) ---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mipsel.orig 2016-08-31 20:27:07.857760158 +0200 -+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_mipsel 2016-08-31 21:01:06.977736874 +0200 -@@ -19,7 +19,9 @@ - - LD=@CXX@ + #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS) +-DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS) ++DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mipsel._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mipsel +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mipsel._orig 2024-02-22 08:37:49.342919440 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_mipsel 2024-02-22 08:59:04.557427310 +0100 +@@ -21,5 +21,5 @@ LD=@CXX@ -+COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -+OPTIMIZE_FLAGS=-fno-omit-frame-pointer # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion # you may remove it if engine is getting compiled with any other GCC version -PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC --DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-non-virtual-dtor -+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -+DEV_FLAGS=$(COMMON_FLAGS) -DDEBUG_GDS_ALLOC -Wall -Wno-switch -Wno-non-virtual-dtor ---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc.orig 2016-08-31 20:27:07.857760158 +0200 -+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc 2016-08-31 21:03:32.994401873 +0200 -@@ -18,6 +18,9 @@ +-DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -Wno-non-virtual-dtor ++PROD_FLAGS=@CFLAGS@ -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC ++DEV_FLAGS=@CFLAGS@ -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -Wno-non-virtual-dtor +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc._orig 2024-02-22 08:37:49.346252747 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc 2024-02-22 09:00:37.110050069 +0100 +@@ -18,6 +18,6 @@ # # 2 Oct 2002, Nickolay Samofatov - Major cleanup -PROD_FLAGS=-ggdb -fno-omit-frame-pointer -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3 --DEV_FLAGS=-ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -fsigned-char -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor -+COMMON_FLAGS=@CFLAGS@ -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DPowerPC -DPPC -+OPTIMIZE_FLAGS=-fno-omit-frame-pointer -+ -+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -+DEV_FLAGS=$(COMMON_FLAGS) -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor - #DEV_FLAGS=-DUSE_VALGRIND -ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor ---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64.orig 2016-08-31 21:09:42.987730985 +0200 -+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64 2016-08-31 21:09:45.644397621 +0200 -@@ -20,8 +20,8 @@ - - #LD=@CXX@ - --#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC --#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch -+COMMON_FLAGS=@CFLAGS@ -DLINUX -DPPC64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 -+OPTIMIZE_FLAGS= +-DEV_FLAGS=-ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -fsigned-char -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor ++PROD_FLAGS=@CFLAGS@ -fno-omit-frame-pointer -fsigned-char -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -DLINUX -DPowerPC -DPPC -O3 ++DEV_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -fsigned-char -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor + #DEV_FLAGS=-DUSE_VALGRIND -ggdb -O0 -DLINUX -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -DLINUX -DPowerPC -DPPC -Wno-non-virtual-dtor +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64 +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64._orig 2024-02-22 08:37:49.346252747 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64 2024-02-22 09:01:39.009585755 +0100 +@@ -23,5 +23,5 @@ + #PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC + #DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -PROD_FLAGS=-O3 -DLINUX -DPPC64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 --DEV_FLAGS=-ggdb -DLINUX -DPPC64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor -+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -+DEV_FLAGS=$(COMON_FLAGS) -Wno-non-virtual-dtor ---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64el.orig 2016-04-14 16:07:29.000000000 +0200 -+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_powerpc64el 2016-08-31 21:10:53.874396836 +0200 -@@ -20,8 +20,8 @@ - - #LD=@CXX@ - --#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC --#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch -+COMMON_FLAGS=@CFLAGS@ -DLINUX -DPPC64EL -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 -+OPTIMIZE_FLAGS= +-DEV_FLAGS=-ggdb -DLINUX -DPPC64 -pipe -p -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor ++PROD_FLAGS=@CFLAGS@ -DLINUX -DPPC64 -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 ++DEV_FLAGS=@CFLAGS@ -DLINUX -DPPC64 -pipe -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64el._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64el +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64el._orig 2024-02-22 08:37:49.346252747 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_powerpc64el 2024-02-22 09:02:33.409184029 +0100 +@@ -23,5 +23,5 @@ + #PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC + #DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Werror=delete-incomplete -Wall -Wno-switch -PROD_FLAGS=-O3 -DLINUX -DPPC64EL -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 --DEV_FLAGS=-ggdb -DLINUX -DPPC64EL -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor -+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -+DEV_FLAGS=$(COMMON_FLAGS) -Wno-non-virtual-dtor -diff -up Firebird-4.0.4.3010-0/builds/posix/prefix.linux_s390x.orig Firebird-4.0.4.3010-0/builds/posix/prefix.linux_s390x ---- Firebird-4.0.4.3010-0/builds/posix/prefix.linux_s390x.orig 2023-12-20 10:35:28.289760024 +0100 -+++ Firebird-4.0.4.3010-0/builds/posix/prefix.linux_s390x 2023-12-20 10:48:11.021611175 +0100 +-DEV_FLAGS=-ggdb -DLINUX -DPPC64EL -pipe -p -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor ++PROD_FLAGS=@CFLAGS@ -DLINUX -DPPC64EL -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 ++DEV_FLAGS=@CFLAGS@ -DLINUX -DPPC64EL -pipe -MMD -fPIC -Werror=delete-incomplete -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_s390x._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_s390x +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_s390x._orig 2024-02-22 08:37:49.346252747 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_s390x 2024-02-22 09:03:36.152060506 +0100 @@ -18,10 +18,10 @@ # # 2 Oct 2002, Nickolay Samofatov - Major cleanup @@ -157,22 +135,22 @@ diff -up Firebird-4.0.4.3010-0/builds/posix/prefix.linux_s390x.orig Firebird-4.0 -OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer -fno-builtin +COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fsigned-char -Wno-invalid-offsetof +OPTIMIZE_FLAGS=-fno-omit-frame-pointer -fno-builtin - WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor + WARN_FLAGS=-Werror=delete-incomplete -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-non-virtual-dtor PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS) #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS) -DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS) +DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) ---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_sparc32.orig 2016-08-31 20:27:07.857760158 +0200 -+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_sparc32 2016-08-31 21:06:34.644399800 +0200 -@@ -18,6 +18,7 @@ +diff -up Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_sparc32._orig Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_sparc32 +--- Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_sparc32._orig 2024-02-22 08:37:49.346252747 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/posix/prefix.linux_sparc32 2024-02-22 09:05:08.354733545 +0100 +@@ -18,6 +18,6 @@ # # 2 Oct 2002, Nickolay Samofatov - Major cleanup -COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL -PROD_FLAGS=-ggdb -mcpu=ultrasparc -mtune=ultrasparc -O3 $(COMMON_FLAGS) --DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor +-DEV_FLAGS=-ggdb -p -Werror=delete-incomplete -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor +COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -Dsparc -DFB_SEND_FLAGS=MSG_NOSIGNAL -+OPTIMIZE_FLAGS= -+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -+DEV_FLAGS=-p -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor ++PROD_FLAGS=$(COMMON_FLAGS) ++DEV_FLAGS=@CFLAGS@ -Werror=delete-incomplete -Wall -Wno-switch $(COMMON_FLAGS) -Wno-non-virtual-dtor diff --git a/Firebird.spec b/Firebird.spec index f17d946..cbae08c 100644 --- a/Firebird.spec +++ b/Firebird.spec @@ -9,20 +9,20 @@ # - create SYSDBA user with initial password before first firebird start # eg.: # su firebird -# echo "create user SYSDBA password 'masterkey';"|fb_isql -u SYSDBA /var/lib/firebird/security4.fdb +# echo "create user SYSDBA password 'masterkey';"|fb_isql -u SYSDBA /var/lib/firebird/security5.fdb # Summary: Firebird SQL Database Server and Client tools Summary(de.UTF-8): Firebird - relationalen Open-Source- Datenbankmanagementsystems Summary(pl.UTF-8): Firebird - serwer baz danych SQL oraz narzędzia klienckie Name: Firebird -Version: 4.0.4.3010 -Release: 0.3 +Version: 5.0.0.1306 +Release: 1 License: Interbase Public License 1.0, Initial Developer's Public License 1.0 Group: Applications/Databases -Source0: https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/%{name}-%{version}-0.tar.xz -# Source0-md5: 25da348775097c75c5458e91a761909f -Source1: http://www.firebirdsql.org/file/documentation/reference_manuals/user_manuals/%{name}-3-QuickStart.pdf -# Source1-md5: c69991a4311090d6d672f7faaab6390e +Source0: https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0/%{name}-%{version}-0-source.tar.xz +# Source0-md5: 9d8b64e922df57d6a3f3de1acca4f8e3 +Source1: https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/qsg5/firebird-5-quickstartguide.pdf +# Source1-md5: 626ec3f9d58485bf8be2249bb8cded3e # distfiles refuses this, would require some audit to allow '('/')' chars #Source2: http://www.firebirdsql.org/pdfmanual/Using-Firebird_(wip).pdf ## Source2-md5: 9eb90583c200bdd7292a80ecc1df1178 @@ -46,8 +46,8 @@ Source11: http://www.firebirdsql.org/pdfmanual/%{name}-gfix.pdf # Source11-md5: 22e2cdc1058dd4f764728bcb3a8644f0 Source12: http://www.firebirdsql.org/pdfmanual/%{name}-gsplit.pdf # Source12-md5: 0147b5d2118e2e80c93762600107a71f -Source13: https://firebirdsql.org/file/documentation/pdf/en/refdocs/fblangref30/firebird-30-language-reference.pdf -# Source13-md5: a4a711621697fb1a23c35943a79d763b +Source13: https://firebirdsql.org/file/documentation/pdf/en/refdocs/fblangref50/firebird-50-language-reference.pdf +# Source13-md5: cf095a223a7b7f631e6a4b8a9604b1da Source100: firebird.init Source101: firebird.sysconfig Source102: firebird.inetd @@ -63,10 +63,8 @@ Patch1: %{name}-editline.patch Patch2: %{name}-va.patch Patch3: %{name}-FHS.patch Patch4: %{name}-opt.patch -Patch5: %{name}-gcc-icu.patch Patch6: %{name}-libpath.patch Patch7: add-pkgconfig-files.patch -Patch9: parallel-build.patch Patch10: no-copy-from-icu.patch Patch11: config.patch Patch12: chown.patch @@ -198,16 +196,14 @@ Firebird Classic (inetd) init scripts. Skrypty startowe Firebirda w wersji Classic (inetd). %prep -%setup -q -n %{name}-%{version}-0 +%setup -q -n %{name}-%{version}-0-source %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch9 -p1 %patch11 -p1 %patch12 -p1 %patch13 -p1 @@ -261,13 +257,13 @@ touch $RPM_BUILD_ROOT/var/log/firebird.log cp -p gen/install/misc/fbclient.pc $RPM_BUILD_ROOT%{_pkgconfigdir} cd gen/buildroot -cp -p var/lib/firebird/security4.fdb $RPM_BUILD_ROOT/var/lib/firebird +cp -p var/lib/firebird/security5.fdb $RPM_BUILD_ROOT/var/lib/firebird cp -p etc/firebird/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/firebird chmod 755 usr/include/firebird/impl cp -pr usr/include/* $RPM_BUILD_ROOT%{_includedir} cp -dp usr/%{_lib}/*.so* $RPM_BUILD_ROOT%{_libdir} cd .%{ibdir} -cp -a bin help intl plugins firebird.msg $RPM_BUILD_ROOT%{ibdir} +cp -a bin intl plugins firebird.msg $RPM_BUILD_ROOT%{ibdir} ln -s %{ibdir}/intl $RPM_BUILD_ROOT%{_sysconfdir}/firebird ln -s %{ibdir}/{bin,plugins,firebird.msg} $RPM_BUILD_ROOT%{_sysconfdir}/firebird chmod u+w -R examples # allow further cleaning @@ -368,13 +364,13 @@ fi %exclude %{ibdir}/bin/fb_config %exclude %{ibdir}/bin/gpre %exclude %{ibdir}/bin/fbguard -%{ibdir}/help %dir %{ibdir}/intl %attr(755,root,root) %{ibdir}/intl/fbintl # should it be moved to %{_sysconfdir} and marked as config? %{ibdir}/intl/fbintl.conf %dir %{ibdir}/plugins %attr(755,root,root) %{ibdir}/plugins/libChaCha.so +%attr(755,root,root) %{ibdir}/plugins/libDefault_Profiler.so %attr(755,root,root) %{ibdir}/plugins/libfbtrace.so %attr(755,root,root) %{ibdir}/plugins/libEngine13.so %attr(755,root,root) %{ibdir}/plugins/libLegacy_Auth.so @@ -389,7 +385,7 @@ fi %{ibdir}/firebird.msg %dir %attr(770,root,firebird) /var/lib/firebird -%attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/lib/firebird/security4.fdb +%attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/lib/firebird/security5.fdb %attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/log/firebird.log diff --git a/add-pkgconfig-files.patch b/add-pkgconfig-files.patch index 13bfb98..b25b2f6 100644 --- a/add-pkgconfig-files.patch +++ b/add-pkgconfig-files.patch @@ -24,13 +24,13 @@ index 000000000000..d49fdc5821c5 +Version: @FIREBIRD_VERSION@ +Cflags: -I${includedir}/firebird +Libs: -L${libdir} -lfbclient ---- Firebird-4.0.4.3010-0/configure.ac.orig 2023-12-20 10:52:31.953327516 +0100 -+++ Firebird-4.0.4.3010-0/configure.ac 2023-12-20 10:55:11.442202827 +0100 -@@ -1378,6 +1378,7 @@ +--- Firebird-5.0.0.1306-0-source/configure.ac.orig 2024-02-22 09:18:28.582654361 +0100 ++++ Firebird-5.0.0.1306-0-source/configure.ac 2024-02-22 09:20:41.441784406 +0100 +@@ -1540,6 +1540,7 @@ gen/install/misc/firebird.init.d.gentoo:builds/install/arch-specific/linux/firebird.init.d.gentoo.in gen/install/misc/firebird.init.d.slackware:builds/install/arch-specific/linux/firebird.init.d.slackware.in gen/install/misc/rc.config.firebird:builds/install/arch-specific/linux/rc.config.firebird.in + gen/install/misc/fbclient.pc:builds/install/arch-specific/linux/misc/fbclient.pc.in - gen/Release/firebird/bin/linuxLibrary.sh:builds/install/arch-specific/linux/linuxLibrary.sh.in gen/install/misc/firebird.service:builds/install/arch-specific/linux/firebird.service.in ], + [chmod a+x gen/install/*sh 2>/dev/null]) diff --git a/config.patch b/config.patch index 2058a00..ef4acb2 100644 --- a/config.patch +++ b/config.patch @@ -1,16 +1,14 @@ -diff -up Firebird-4.0.4.3010-0/builds/install/misc/firebird.conf._orig Firebird-4.0.4.3010-0/builds/install/misc/firebird.conf ---- Firebird-4.0.4.3010-0/builds/install/misc/firebird.conf._orig 2023-11-08 13:07:47.000000000 +0100 -+++ Firebird-4.0.4.3010-0/builds/install/misc/firebird.conf 2023-12-20 11:20:04.132941663 +0100 -@@ -735,7 +735,7 @@ - # +--- Firebird-5.0.0.1306-0-source/builds/install/misc/firebird.conf.orig 2024-01-11 11:24:21.000000000 +0100 ++++ Firebird-5.0.0.1306-0-source/builds/install/misc/firebird.conf 2024-02-22 09:29:00.475211032 +0100 +@@ -775,6 +775,7 @@ # Type: string # --#DataTypeCompatibility = + #DataTypeCompatibility = +DataTypeCompatibility = 3.0 - # ---------------------------- -@@ -1200,3 +1200,5 @@ + # =========================== +@@ -1258,3 +1259,5 @@ # Type: integer # #ExtConnPoolLifeTime = 7200 diff --git a/mod_loader.patch b/mod_loader.patch index 2edc25e..0536db0 100644 --- a/mod_loader.patch +++ b/mod_loader.patch @@ -1,21 +1,21 @@ Loosen a bit a module filename check -diff -up Firebird-4.0.4.3010-0/src/common/os/posix/mod_loader.cpp._orig Firebird-4.0.4.3010-0/src/common/os/posix/mod_loader.cpp ---- Firebird-4.0.4.3010-0/src/common/os/posix/mod_loader.cpp._orig 2023-11-08 13:07:47.000000000 +0100 -+++ Firebird-4.0.4.3010-0/src/common/os/posix/mod_loader.cpp 2023-12-22 13:56:00.026703313 +0100 -@@ -184,7 +184,6 @@ void* DlfcnModule::findSymbol(ISC_STATUS - } +diff -up Firebird-5.0.0.1306-0-source/src/common/os/posix/mod_loader.cpp._orig Firebird-5.0.0.1306-0-source/src/common/os/posix/mod_loader.cpp +--- Firebird-5.0.0.1306-0-source/src/common/os/posix/mod_loader.cpp._orig 2024-02-22 09:31:12.670991187 +0100 ++++ Firebird-5.0.0.1306-0-source/src/common/os/posix/mod_loader.cpp 2024-02-22 09:34:31.349588488 +0100 +@@ -199,7 +199,6 @@ void* DlfcnModule::findSymbol(ISC_STATUS + symbolPath = info.dli_fname; const char* errText = "Actual module name does not match requested"; -- if (PathUtils::isRelative(fileName) || PathUtils::isRelative(info.dli_fname)) +- if (PathUtils::isRelative(libraryPath) || PathUtils::isRelative(symbolPath)) { // check only name (not path) of the library Firebird::PathName dummyDir, nm1, nm2; -@@ -196,11 +195,6 @@ void* DlfcnModule::findSymbol(ISC_STATUS +@@ -211,11 +210,6 @@ void* DlfcnModule::findSymbol(ISC_STATUS return NULL; } } -- else if (fileName != info.dli_fname) +- else if (libraryPath != symbolPath) - { - makeErrorStatus(status, errText); - return NULL; diff --git a/parallel-build.patch b/parallel-build.patch deleted file mode 100644 index 81642a2..0000000 --- a/parallel-build.patch +++ /dev/null @@ -1,178 +0,0 @@ -Description: allow building with make -jN - without this there are sporadic segmentation faults - . - it seems that when gpre opens a database, it clashes with other gpre - processes that have the database open. perhaps this is because at - this stage of the build the compiled firebird engine lacks ability for - synchronisation. So, wrap all engine-using calls with a lock file -Author: Damyan Ivanov -Forwarded: no - -diff -up Firebird-4.0.4.3010-0/builds/posix/Makefile.in.orig Firebird-4.0.4.3010-0/builds/posix/Makefile.in ---- Firebird-4.0.4.3010-0/builds/posix/Makefile.in.orig 2023-12-20 10:59:23.894063119 +0100 -+++ Firebird-4.0.4.3010-0/builds/posix/Makefile.in 2023-12-20 11:04:55.318624451 +0100 -@@ -442,8 +442,8 @@ yachts.lnk: metadata.fdb - - metadata.fdb: $(RUN_ISQL) $(SRC_ROOT)/dbs/metadata.sql - -$(RM) $@ -- $(RUN_ISQL) -q -i $(SRC_ROOT)/dbs/metadata.sql -- $(RUN_GFIX) -mode read_only $@ -+ $(call LOCK_RUN,$(RUN_ISQL) -q -i $(SRC_ROOT)/dbs/metadata.sql) -+ $(call LOCK_RUN,$(RUN_GFIX) -mode read_only $@) - $(CHMOD) 0444 $@ - - $(HELP_FDB): help.fdb -@@ -452,7 +452,7 @@ $(HELP_FDB): help.fdb - $(CHMOD) 0444 $@ - - help.fdb: $(BLD_ROOT)/misc/help.gbak -- $(RUN_GBAK) -MODE read_only -R $< $@ -+ $(call LOCK_RUN,$(RUN_GBAK) -MODE read_only -R $< $@) - $(CHMOD) 0444 $@ - - $(SECURITY_FDB): security.fdb -@@ -462,18 +462,18 @@ $(SECURITY_FDB): security.fdb - security.fdb: $(SRC_ROOT)/dbs/security.sql - -$(RM) $@ - -$(RM) $(SECURITY_TMP) -- echo create database \'$(SECURITY_TMP)\'\; | $(RUN_ISQL) -- $(RUN_GFIX) -write async $(SECURITY_TMP) -- $(RUN_ISQL) -i $^ $(SECURITY_TMP) -+ $(call LOCK_RUN,echo create database \'$(SECURITY_TMP)\'\; | $(RUN_ISQL)) -+ $(call LOCK_RUN,$(RUN_GFIX) -write async $(SECURITY_TMP)) -+ $(call LOCK_RUN,$(RUN_ISQL) -i $^ $(SECURITY_TMP)) - $(CHMOD) a=rw $(SECURITY_TMP) - $(CP) $(SECURITY_TMP) $@ -- $(RUN_GFIX) -write sync $@ -+ $(call LOCK_RUN,$(RUN_GFIX) -write sync $@) - - msg.timestamp: $(MSG_FILES) - -$(RM) msg.fdb -- echo create database \'msg.fdb\'\; | $(RUN_ISQL) -- $(RUN_GFIX) -write async msg.fdb -- for sql in $(MSG_FILES); do (echo $$sql; $(RUN_ISQL) -i $$sql msg.fdb) || exit; done -+ $(call LOCK_RUN,echo create database \'msg.fdb\'\; | $(RUN_ISQL)) -+ $(call LOCK_RUN,$(RUN_GFIX) -write async msg.fdb) -+ $(call LOCK_RUN,for sql in $(MSG_FILES); do (echo $$sql; $(RUN_ISQL) -i $$sql msg.fdb) || exit; done) - $(TOUCH) $@ - - -@@ -643,7 +643,7 @@ CODES = $(BIN)/codes$(EXEC_EXT) - codes: gen_codes - - gen_codes: $(CODES) msg.timestamp -- $(CODES) $(SRC_ROOT)/include/gen $(LNG_ROOT) -+ $(call LOCK_RUN,$(CODES) $(SRC_ROOT)/include/gen $(LNG_ROOT)) - - $(CODES): $(CODES_Objects) $(COMMON_LIB) - $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) -@@ -675,7 +675,7 @@ examples: include_generic - message_file: $(FIREBIRD_MSG) - - $(FIREBIRD_MSG): $(BUILD_FILE) msg.timestamp -- $(BUILD_FILE) -d msg.fdb -f $@ -+ $(call LOCK_RUN,$(BUILD_FILE) -d msg.fdb -f $@) - $(CHMOD_6) $@ - - tzdata: $(FIREBIRD)/tzdata -diff -up Firebird-4.0.4.3010-0/builds/posix/Makefile.in.examples.orig Firebird-4.0.4.3010-0/builds/posix/Makefile.in.examples ---- Firebird-4.0.4.3010-0/builds/posix/Makefile.in.examples.orig 2023-11-08 13:07:47.000000000 +0100 -+++ Firebird-4.0.4.3010-0/builds/posix/Makefile.in.examples 2023-12-20 10:59:23.900729743 +0100 -@@ -140,8 +140,8 @@ $(EXAMPLES_DEST)% : $(EXAMPLES_SRC)% - - $(EMPLOYEE_DB): $(EXAMPLES_DEST)/empbuild$(EXEC_EXT) $(INPUT_Sources) $(EXAMPLES_DEST)/isql$(EXEC_EXT) - -$(RM) $(EMPLOYEE_DB) -- ./empbuild $(EMPLOYEE_DB) -- $(GFIX) -write sync $(EMPLOYEE_DB) -+ $(call LOCK_RUN,./empbuild $(EMPLOYEE_DB)) -+ $(call LOCK_RUN,$(GFIX) -write sync $(EMPLOYEE_DB)) - -$(CHMOD_6) $(EMPLOYEE_DB) - - # To get past the fact isql is called from the programs, we create a local link in this directory -@@ -157,7 +157,7 @@ $(EXAMPLES_DEST)/empbuild.c: $(EXAMPLES_ - - $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPLES_DEST)/empddl.sql $(EXAMPLES_DEST)/empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT) - -$(RM) $(EXAMPLES_DEST)/empbuild.fdb -- $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i empbld.sql -+ $(call LOCK_RUN,$(EXAMPLES_DEST)/isql$(EXEC_EXT) -i empbld.sql) - - # The chain for intlemp.fdb is the same a script file to create an empty database - # to allow a .e program to be compiled, to then create and populate with data -@@ -165,7 +165,7 @@ $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPL - - $(EXAMPLES_DEST)/intlemp.fdb: $(EXAMPLES_DEST)/intlbld$(EXEC_EXT) $(INTL_Sources) $(EXAMPLES_DEST)/isql$(EXEC_EXT) - -$(RM) intlemp.fdb -- ./intlbld intlemp.fdb -+ $(call LOCK_RUN,./intlbld intlemp.fdb) - -$(CHMOD_6) intlemp.fdb - - $(EXAMPLES_DEST)/intlbld$(EXEC_EXT): $(INTLBLD_Objects) $(COMMON_LIB) -@@ -175,7 +175,7 @@ $(EXAMPLES_DEST)/intlbld.c: $(EXAMPLES_D - - $(EXAMPLES_DEST)/intlbuild.fdb : $(EXAMPLES_DEST)/intlddl.sql $(EXAMPLES_DEST)/intlbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT) - -$(RM) intlbuild.fdb -- $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i intlbld.sql -+ $(call LOCK_RUN,$(EXAMPLES_DEST)/isql$(EXEC_EXT) -i intlbld.sql) - - - $(EXAMPLES_DEST)/%.sql: $(EXAMPLES_SRC)/empbuild/%.sql -diff -up Firebird-4.0.4.3010-0/builds/posix/make.defaults.orig Firebird-4.0.4.3010-0/builds/posix/make.defaults ---- Firebird-4.0.4.3010-0/builds/posix/make.defaults.orig 2023-12-20 10:59:23.900729743 +0100 -+++ Firebird-4.0.4.3010-0/builds/posix/make.defaults 2023-12-20 11:06:32.591338933 +0100 -@@ -427,6 +427,7 @@ GPRE_BOOT = $(RBIN)/gpre_boot$(EXE - GPRE = $(BIN)/gpre$(EXEC_EXT) - RUN_GPRE = $(RBIN)/gpre$(EXEC_EXT) - GPRE_CURRENT = $(RBIN)/gpre_current$(EXEC_EXT) -+LOCK_RUN = sh -x -c "lockfile -1 $(BIN)/build-db.lock && $(subst $$,\$$,$(1)); res=\$$?; rm -f $(BIN)/build-db.lock; exit \$$res" - - # From msgs - CHECK_MESSAGES = $(BIN)/check_messages$(EXEC_EXT) -diff -up Firebird-4.0.4.3010-0/builds/posix/make.rules.orig Firebird-4.0.4.3010-0/builds/posix/make.rules ---- Firebird-4.0.4.3010-0/builds/posix/make.rules.orig 2023-12-20 10:59:23.900729743 +0100 -+++ Firebird-4.0.4.3010-0/builds/posix/make.rules 2023-12-20 11:08:35.277238011 +0100 -@@ -88,20 +88,20 @@ OBJECT_GPRE_FLAGS = -m -z -n -ocxx - .SUFFIXES: .c .e .epp .cpp - - .e.c: -- $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ -+ $(call LOCK_RUN,$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@) - - - $(OBJ)/jrd/%.cpp: $(SRC_ROOT)/jrd/%.epp -- $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $(firstword $<) $@ -+ $(call LOCK_RUN,$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $(firstword $<) $@) - - $(OBJ)/isql/%.cpp: $(SRC_ROOT)/isql/%.epp -- $(GPRE_CURRENT) $(OBJECT_GPRE_FLAGS) $< $@ -+ $(call LOCK_RUN,$(GPRE_CURRENT) $(OBJECT_GPRE_FLAGS) $< $@) - - $(OBJ)/burp/%.cpp: $(SRC_ROOT)/burp/%.epp -- $(GPRE_CURRENT) $(OBJECT_GPRE_FLAGS) $< $@ -+ $(call LOCK_RUN,$(GPRE_CURRENT) $(OBJECT_GPRE_FLAGS) $< $@) - - $(OBJ)/%.cpp: $(SRC_ROOT)/%.epp -- $(GPRE_CURRENT) $(GPRE_FLAGS) $(firstword $<) $@ -+ $(call LOCK_RUN,$(GPRE_CURRENT) $(GPRE_FLAGS) $(firstword $<) $@) - - - .SUFFIXES: .lo .o .cpp .c .cc -diff -up Firebird-4.0.4.3010-0/builds/posix/make.shared.targets.orig Firebird-4.0.4.3010-0/builds/posix/make.shared.targets ---- Firebird-3.0.7.33374-0.org/builds/posix/make.shared.targets 2020-10-20 08:40:05.000000000 +0000 -+++ Firebird-3.0.7.33374-0/builds/posix/make.shared.targets 2022-04-04 17:53:33.598825549 +0000 -@@ -65,13 +65,13 @@ $(OBJ)/dsql/Parser.o $(OBJ)/common/keywo - - # Special cases for building cpp from epp - $(OBJ)/dsql/metd.cpp: $(SRC_ROOT)/dsql/metd.epp -- $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@ -+ $(call LOCK_RUN,$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@) - - $(OBJ)/dsql/DdlNodes.cpp: $(SRC_ROOT)/dsql/DdlNodes.epp -- $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@ -+ $(call LOCK_RUN,$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@) - - $(OBJ)/dsql/PackageNodes.cpp: $(SRC_ROOT)/dsql/PackageNodes.epp -- $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@ -+ $(call LOCK_RUN,$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@) - - # Adding resources as prerequisite for some files -