[packages/Firebird] - updated to 4.0.4.3010
bszx
bszx at pld-linux.org
Fri Jan 12 11:07:05 CET 2024
commit eee53b00731af98a74bce9818a77911045df0ad1
Author: Bartek Szady <bszx at bszx.eu>
Date: Thu Jan 11 14:18:02 2024 +0100
- updated to 4.0.4.3010
Firebird-FHS.patch | 10 +-
Firebird-editline.patch | 25 +++--
Firebird-opt.patch | 121 ++++++++++-----------
Firebird.spec | 33 +++---
...zed-global-delete-operators-when-compiled.patch | 36 ------
add-pkgconfig-files.patch | 16 +--
cloop-honour-build-flags.patch | 12 +-
config.patch | 20 +++-
mod_loader.patch | 22 ++--
parallel-build.patch | 67 ++++++------
10 files changed, 168 insertions(+), 194 deletions(-)
---
diff --git a/Firebird.spec b/Firebird.spec
index 0514013..f17d946 100644
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -9,18 +9,18 @@
# - 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/security3.fdb
+# echo "create user SYSDBA password 'masterkey';"|fb_isql -u SYSDBA /var/lib/firebird/security4.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: 3.0.11.33703
-Release: 1
+Version: 4.0.4.3010
+Release: 0.3
License: Interbase Public License 1.0, Initial Developer's Public License 1.0
Group: Applications/Databases
-Source0: https://github.com/FirebirdSQL/firebird/releases/download/v3.0.11/%{name}-%{version}-0.tar.bz2
-# Source0-md5: 9bd594afdc55690ec66aaf130d8cc2cc
+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
# distfiles refuses this, would require some audit to allow '('/')' chars
@@ -66,7 +66,6 @@ Patch4: %{name}-opt.patch
Patch5: %{name}-gcc-icu.patch
Patch6: %{name}-libpath.patch
Patch7: add-pkgconfig-files.patch
-Patch8: Provide-sized-global-delete-operators-when-compiled.patch
Patch9: parallel-build.patch
Patch10: no-copy-from-icu.patch
Patch11: config.patch
@@ -96,6 +95,7 @@ Requires: %{name}-lib = %{version}-%{release}
ExclusiveArch: %{ix86} %{x8664} x32 arm ia64 mips mipsel ppc sparc sparcv9 alpha
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define filterout -flto
%define ibdir %{_libdir}/interbase
%define specflags -fno-strict-aliasing
%define debugcflags -O1 -g -Wall -fno-strict-aliasing
@@ -207,7 +207,6 @@ Skrypty startowe Firebirda w wersji Classic (inetd).
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
%patch9 -p1
%patch11 -p1
%patch12 -p1
@@ -262,15 +261,15 @@ 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/security3.fdb $RPM_BUILD_ROOT/var/lib/firebird
+cp -p var/lib/firebird/security4.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 UDF bin help intl plugins firebird.msg $RPM_BUILD_ROOT%{ibdir}
+cp -a bin help intl plugins firebird.msg $RPM_BUILD_ROOT%{ibdir}
ln -s %{ibdir}/intl $RPM_BUILD_ROOT%{_sysconfdir}/firebird
-ln -s %{ibdir}/{UDF,bin,plugins,firebird.msg} $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
cp -rf examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -344,15 +343,15 @@ fi
%files
%defattr(644,root,root,755)
-%doc doc/{license,sql.extensions,Firebird_conf.txt,README.user*,WhatsNew,fb2-todo.txt}
+%doc doc/{license,sql.extensions,Firebird_conf.txt,README.user*}
%dir %{_sysconfdir}/firebird
%dir %{_sysconfdir}/firebird/conf.d
%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/databases.conf
%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/fbtrace.conf
%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/firebird.conf
%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/plugins.conf
+%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/replication.conf
%{_sysconfdir}/firebird/intl
-%{_sysconfdir}/firebird/UDF
%{_sysconfdir}/firebird/bin
%{_sysconfdir}/firebird/firebird.msg
%{_sysconfdir}/firebird/plugins
@@ -365,7 +364,6 @@ fi
%attr(755,root,root) %{_bindir}/gstat
%attr(755,root,root) %{_bindir}/nbackup
%attr(755,root,root) %{_libdir}/libib_util.so
-%attr(755,root,root) %{ibdir}/UDF
%attr(755,root,root) %{ibdir}/bin/*
%exclude %{ibdir}/bin/fb_config
%exclude %{ibdir}/bin/gpre
@@ -376,21 +374,22 @@ fi
# 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/libfbtrace.so
-%attr(755,root,root) %{ibdir}/plugins/libCryptKeyHolder_example.so
-%attr(755,root,root) %{ibdir}/plugins/libDbCrypt_example.so
-%attr(755,root,root) %{ibdir}/plugins/libEngine12.so
+%attr(755,root,root) %{ibdir}/plugins/libEngine13.so
%attr(755,root,root) %{ibdir}/plugins/libLegacy_Auth.so
%attr(755,root,root) %{ibdir}/plugins/libLegacy_UserManager.so
%attr(755,root,root) %{ibdir}/plugins/libSrp.so
%attr(755,root,root) %{ibdir}/plugins/libudr_engine.so
%dir %{ibdir}/plugins/udr
+%attr(755,root,root) %{ibdir}/plugins/udr/libudf_compat.so
+%{ibdir}/plugins/udr/udf_compat.sql
%attr(755,root,root) %{ibdir}/plugins/udr/libudrcpp_example.so
%{ibdir}/plugins/udr_engine.conf
%{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/security3.fdb
+%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/log/firebird.log
diff --git a/Firebird-FHS.patch b/Firebird-FHS.patch
index ccbb86f..edb3666 100644
--- a/Firebird-FHS.patch
+++ b/Firebird-FHS.patch
@@ -1,6 +1,6 @@
---- Firebird-3.0.10.33601-0/src/yvalve/gds.cpp.orig 2022-07-01 08:34:37.770832195 +0200
-+++ Firebird-3.0.10.33601-0/src/yvalve/gds.cpp 2022-07-01 08:41:44.837560283 +0200
-@@ -3826,10 +3826,7 @@
+--- Firebird-4.0.4.3010-0/src/yvalve/gds.cpp.orig 2023-12-20 10:30:04.215137656 +0100
++++ Firebird-4.0.4.3010-0/src/yvalve/gds.cpp 2023-12-20 10:34:30.890122203 +0100
+@@ -3950,10 +3950,7 @@
if (!fb_utils::readenv(FB_LOCK_ENV, lockPrefix))
{
#if !defined(WIN_NT)
@@ -10,5 +10,5 @@
- PathUtils::concatPath(lockPrefix, tmp, LOCKDIR);
+ PathUtils::concatPath(lockPrefix, "/var/lib", LOCKDIR);
#else
- #ifdef WIN9X_SUPPORT
- // shell32.dll version 5.0 and later supports SHGetFolderPath entry point
+ char cmnData[MAXPATHLEN];
+ if (SHGetSpecialFolderPath(NULL, cmnData, CSIDL_COMMON_APPDATA, TRUE))
diff --git a/Firebird-editline.patch b/Firebird-editline.patch
index 95906c3..bc6a010 100644
--- a/Firebird-editline.patch
+++ b/Firebird-editline.patch
@@ -1,14 +1,15 @@
---- Firebird-3.0.0.32483-0/configure.ac.orig 2010-09-08 10:44:05.000000000 +0200
-+++ Firebird-3.0.0.32483-0/configure.ac 2010-10-27 22:32:38.567739367 +0200
-@@ -652,10 +652,10 @@
- AC_SEARCH_LIBS(dlopen, dl)
- AC_CHECK_LIB(m, main)
+diff -up Firebird-4.0.4.3010-0/configure.ac._orig Firebird-4.0.4.3010-0/configure.ac
+--- Firebird-4.0.4.3010-0/configure.ac._orig 2024-01-11 13:38:19.046694587 +0100
++++ Firebird-4.0.4.3010-0/configure.ac 2024-01-11 13:48:42.098677678 +0100
+@@ -887,10 +887,10 @@ AC_SUBST(CRYPTLIB)
+ dnl Check for termcap support
if test "$EDITLINE_FLG" = "Y"; then
-+ AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
- AC_CHECK_LIB(curses, tgetent, TERMLIB=curses, \
- AC_CHECK_LIB(ncurses, tgetent, TERMLIB=ncurses, \
- AC_CHECK_LIB(termcap, tgetent, TERMLIB=termcap, \
-- AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
- AC_MSG_ERROR(termcap support not found)))))
+ if test -z "$TERMLIB"; then
++ AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
+ AC_CHECK_LIB(curses, tgetent, TERMLIB=curses, \
+ AC_CHECK_LIB(ncurses, tgetent, TERMLIB=ncurses, \
+ AC_CHECK_LIB(termcap, tgetent, TERMLIB=termcap, \
+- AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
+ AC_MSG_ERROR(termcap support not found)))))
+ fi
AC_SUBST(TERMLIB)
- XE_APPEND(-l$TERMLIB, LIBS)
diff --git a/Firebird-opt.patch b/Firebird-opt.patch
index 2fbc066..e569aba 100644
--- a/Firebird-opt.patch
+++ b/Firebird-opt.patch
@@ -1,76 +1,69 @@
---- Firebird-3.0.4.33054-0/builds/posix/prefix.linux.orig 2018-10-22 15:04:00.969062218 +0200
-+++ Firebird-3.0.4.33054-0/builds/posix/prefix.linux 2018-10-31 07:52:26.717188011 +0100
-@@ -18,9 +18,9 @@
+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
+@@ -18,8 +18,8 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks
-+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks
- CXXFLAGS=-std=gnu++03
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-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
+ WARN_FLAGS=-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
- PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-diff -up Firebird-3.0.9.33560-0/builds/posix/prefix.linux_amd64.orig Firebird-3.0.9.33560-0/builds/posix/prefix.linux_amd64
---- Firebird-3.0.9.33560-0/builds/posix/prefix.linux_amd64.orig 2022-04-25 12:12:11.720212530 +0200
-+++ Firebird-3.0.9.33560-0/builds/posix/prefix.linux_amd64 2022-04-25 13:04:31.045965585 +0200
-@@ -18,9 +18,9 @@
+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
+@@ -18,8 +18,8 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
-
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks
-+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks
- CXXFLAGS=-std=gnu++03
--OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
-+OPTIMIZE_FLAGS=-fno-omit-frame-pointer
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof -Wno-narrowing -Wno-unused-local-typedefs -Wno-class-memaccess
-
- PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-diff -up Firebird-3.0.9.33560-0/builds/posix/prefix.linux_arm.orig Firebird-3.0.9.33560-0/builds/posix/prefix.linux_arm
---- Firebird-3.0.9.33560-0/builds/posix/prefix.linux_arm.orig 2022-04-25 12:12:11.720212530 +0200
-+++ Firebird-3.0.9.33560-0/builds/posix/prefix.linux_arm 2022-04-25 13:07:08.771586881 +0200
-@@ -21,9 +21,9 @@
- #PROD_FLAGS=-O3 -DLINUX -DARM -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 -DFB_SEND_FLAGS=MSG_NOSIGNAL
- #DEV_FLAGS=-ggdb -DLINUX -DARM -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor -DFB_SEND_FLAGS=MSG_NOSIGNAL
-
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DARM -pipe -p -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks -fsigned-char
-+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DARM -pipe -p -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks -fsigned-char
- CXXFLAGS=-std=gnu++03
--OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
-+OPTIMIZE_FLAGS=-fno-omit-frame-pointer
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof -Wno-narrowing -Wno-unused-local-typedefs -Wno-non-virtual-dtor
-
- PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-diff -up Firebird-3.0.9.33560-0/builds/posix/prefix.linux_arm64.orig Firebird-3.0.9.33560-0/builds/posix/prefix.linux_arm64
---- Firebird-3.0.9.33560-0/builds/posix/prefix.linux_arm64.orig 2022-04-25 12:12:11.720212530 +0200
-+++ Firebird-3.0.9.33560-0/builds/posix/prefix.linux_arm64 2022-04-25 13:07:58.594590193 +0200
-@@ -21,9 +21,9 @@
- #PROD_FLAGS=-O3 -DLINUX -DARM64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 -DFB_SEND_FLAGS=MSG_NOSIGNAL
- #DEV_FLAGS=-ggdb -DLINUX -DARM64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor -DFB_SEND_FLAGS=MSG_NO
-
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DARM64 -pipe -p -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks -fsigned-char
-+COMMON_FLAGS=@CFLAGS@ -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DARM64 -pipe -p -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks -fsigned-char
- CXXFLAGS=-std=gnu++03
+
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=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-invalid-offsetof -Wno-narrowing -Wno-unused-local-typedefs -Wno-non-virtual-dtor
-
- PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
---- Firebird-3.0.4.33054-0/builds/posix/prefix.linux_generic.orig 2018-10-22 15:04:00.969062218 +0200
-+++ Firebird-3.0.4.33054-0/builds/posix/prefix.linux_generic 2018-10-31 08:25:12.372864962 +0100
-@@ -18,8 +18,9 @@
+ WARN_FLAGS=-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
+@@ -20,7 +20,7 @@
+
+ #LD=@CXX@
+
+-COMMON_FLAGS=-DLINUX -DARM -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 -DFB_SEND_FLAGS=MSG_NOSIGNAL
++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
++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
+@@ -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
+
+-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
++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
+@@ -18,7 +18,7 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
--COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -fno-delete-null-pointer-checks
-+COMMON_FLAGS=@CFLAGS@ -DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -fno-delete-null-pointer-checks
- CXXFLAGS=-std=gnu++03
-+OPTIMIZE_FLAGS=
+-COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL
++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
-+PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++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
@@ -153,19 +146,23 @@ diff -up Firebird-3.0.9.33560-0/builds/posix/prefix.linux_arm64.orig Firebird-3.
-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
---- Firebird-3.0.0.32483-0/builds/posix/prefix.linux_s390x.orig 2016-08-31 20:27:07.857760158 +0200
-+++ Firebird-3.0.0.32483-0/builds/posix/prefix.linux_s390x 2016-08-31 21:05:39.261067098 +0200
-@@ -18,8 +18,8 @@
+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
+@@ -18,10 +18,10 @@
#
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fsigned-char
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fsigned-char -Wno-invalid-offsetof
-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
++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
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 --git a/Provide-sized-global-delete-operators-when-compiled.patch b/Provide-sized-global-delete-operators-when-compiled.patch
deleted file mode 100644
index 1302d1d..0000000
--- a/Provide-sized-global-delete-operators-when-compiled.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Michal Kubecek <mkubecek at suse.cz>
-Date: Mon, 25 Apr 2016 08:55:36 +0200
-Subject: Provide sized global delete operators when compiled in C++14 mode
-Patch-mainline: submitted
-Git-commit: 038f9fbf559e56032e4cb49eb7ce4c3ead23fda9
-References: bsc#964466 CORE-5099
-
----
- src/common/classes/alloc.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/common/classes/alloc.h b/src/common/classes/alloc.h
-index b1026ce2aac4..fda5bfebb0cc 100644
---- a/src/common/classes/alloc.h
-+++ b/src/common/classes/alloc.h
-@@ -331,6 +331,16 @@ inline void operator delete[](void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS
- MemoryPool::globalFree(mem);
- }
-
-+#if __cplusplus >= 201402L
-+inline void operator delete(void* mem, std::size_t s ALLOC_PARAMS) throw()
-+{
-+ MemoryPool::globalFree(mem);
-+}
-+inline void operator delete[](void* mem, std::size_t s ALLOC_PARAMS) throw()
-+{
-+ MemoryPool::globalFree(mem);
-+}
-+#endif
- #ifdef DEBUG_GDS_ALLOC
-
- #ifdef __clang__
---
-2.8.2
-
-
diff --git a/add-pkgconfig-files.patch b/add-pkgconfig-files.patch
index d8ea48c..13bfb98 100644
--- a/add-pkgconfig-files.patch
+++ b/add-pkgconfig-files.patch
@@ -24,19 +24,13 @@ index 000000000000..d49fdc5821c5
+Version: @FIREBIRD_VERSION@
+Cflags: -I${includedir}/firebird
+Libs: -L${libdir} -lfbclient
-diff --git a/configure.ac b/configure.ac
-index 717f5eccc53d..60b3aaa5b08b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1200,6 +1200,7 @@ case "$PLATFORM" in
+--- 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 @@
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-classic at .service:builds/install/arch-specific/linux/firebird-classic.service.in
- gen/install/misc/firebird-classic.socket:builds/install/arch-specific/linux/firebird-classic.socket.in
---
-2.3.4
-
-
+ gen/install/misc/firebird.service:builds/install/arch-specific/linux/firebird.service.in
+ ],
diff --git a/cloop-honour-build-flags.patch b/cloop-honour-build-flags.patch
index 0939f5a..db68f62 100644
--- a/cloop-honour-build-flags.patch
+++ b/cloop-honour-build-flags.patch
@@ -2,8 +2,8 @@ Description: make cloop build honor compiler/linker flags from the environment
Author: Damyan Ivanov <dmn at debian.org>
Forwarded: no
---- Firebird-3.0.5.33220-0/extern/cloop/Makefile.orig 2020-01-09 10:53:10.000000000 +0100
-+++ Firebird-3.0.5.33220-0/extern/cloop/Makefile 2020-01-13 12:47:47.869169239 +0100
+--- Firebird-4.0.4.3010-0/extern/cloop/Makefile.orig 2023-11-08 13:07:47.000000000 +0100
++++ Firebird-4.0.4.3010-0/extern/cloop/Makefile 2023-12-20 11:25:08.527689312 +0100
@@ -6,7 +6,7 @@
CC := $(CC)
@@ -18,10 +18,10 @@ Forwarded: no
OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
-C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
--CXX_FLAGS := $(C_FLAGS)
+-CXX_FLAGS := $(C_FLAGS) -std=c++11
+COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
+C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS)
-+CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
- FPC_FLAGS := -Mdelphi
++CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS) -std=c++11
+ FPC_FLAGS := -Mdelphi -Cg
- ifeq ($(TARGET),release)
+ ifeq ($(shell uname),FreeBSD)
diff --git a/config.patch b/config.patch
index c499651..2058a00 100644
--- a/config.patch
+++ b/config.patch
@@ -1,8 +1,18 @@
---- Firebird-3.0.2.32703-0/builds/install/misc/firebird.conf.in.orig 2017-03-21 10:11:35.000000000 +0100
-+++ Firebird-3.0.2.32703-0/builds/install/misc/firebird.conf.in 2017-04-03 12:24:52.184150250 +0200
-@@ -919,3 +919,5 @@
- # Type: string
+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 @@
#
- #ServerMode = Super
+ # Type: string
+ #
+-#DataTypeCompatibility =
++DataTypeCompatibility = 3.0
+
+
+ # ----------------------------
+@@ -1200,3 +1200,5 @@
+ # Type: integer
+ #
+ #ExtConnPoolLifeTime = 7200
+
+include conf.d/*.conf
diff --git a/mod_loader.patch b/mod_loader.patch
index ac4f317..2edc25e 100644
--- a/mod_loader.patch
+++ b/mod_loader.patch
@@ -1,21 +1,25 @@
Loosen a bit a module filename check
---- Firebird-3.0.11.33703-0/src/common/os/posix/mod_loader.cpp.orig 2023-09-29 13:31:01.412025778 +0200
-+++ Firebird-3.0.11.33703-0/src/common/os/posix/mod_loader.cpp 2023-09-29 14:06:07.234937115 +0200
-@@ -166,7 +166,6 @@
- if (!realpath(info.dli_fname, symbolPathBuffer))
- symbolPath = info.dli_fname;
+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
+ }
-- if (PathUtils::isRelative(libraryPath) || PathUtils::isRelative(symbolPath))
+ const char* errText = "Actual module name does not match requested";
+- if (PathUtils::isRelative(fileName) || PathUtils::isRelative(info.dli_fname))
{
// check only name (not path) of the library
Firebird::PathName dummyDir, nm1, nm2;
-@@ -175,8 +174,6 @@
- if (nm1 != nm2)
+@@ -196,11 +195,6 @@ void* DlfcnModule::findSymbol(ISC_STATUS
return NULL;
+ }
}
-- else if (libraryPath != symbolPath)
+- else if (fileName != info.dli_fname)
+- {
+- makeErrorStatus(status, errText);
- return NULL;
+- }
#endif
return result;
diff --git a/parallel-build.patch b/parallel-build.patch
index 24155ae..81642a2 100644
--- a/parallel-build.patch
+++ b/parallel-build.patch
@@ -8,9 +8,10 @@ Description: allow building with make -jN
Author: Damyan Ivanov <dmn at debian.org>
Forwarded: no
---- Firebird-3.0.10.33601-0/builds/posix/Makefile.in.orig 2022-06-24 13:13:29.537501538 +0200
-+++ Firebird-3.0.10.33601-0/builds/posix/Makefile.in 2022-06-24 13:15:39.739885352 +0200
-@@ -364,8 +364,8 @@
+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) $@
@@ -21,16 +22,16 @@ Forwarded: no
$(CHMOD) 0444 $@
$(HELP_FDB): help.fdb
-@@ -374,7 +374,7 @@
+@@ -452,7 +452,7 @@ $(HELP_FDB): help.fdb
$(CHMOD) 0444 $@
help.fdb: $(BLD_ROOT)/misc/help.gbak
-- $(RUN_GBAK) -MODE read_only -replace $< $@
-+ $(call LOCK_RUN,$(RUN_GBAK) -MODE read_only -replace $< $@)
+- $(RUN_GBAK) -MODE read_only -R $< $@
++ $(call LOCK_RUN,$(RUN_GBAK) -MODE read_only -R $< $@)
$(CHMOD) 0444 $@
$(SECURITY_FDB): security.fdb
-@@ -384,18 +384,18 @@
+@@ -462,18 +462,18 @@ $(SECURITY_FDB): security.fdb
security.fdb: $(SRC_ROOT)/dbs/security.sql
-$(RM) $@
-$(RM) $(SECURITY_TMP)
@@ -56,8 +57,8 @@ Forwarded: no
$(TOUCH) $@
-@@ -567,7 +567,7 @@
- ids: $(IDS)
+@@ -643,7 +643,7 @@ CODES = $(BIN)/codes$(EXEC_EXT)
+ codes: gen_codes
gen_codes: $(CODES) msg.timestamp
- $(CODES) $(SRC_ROOT)/include/gen $(LNG_ROOT)
@@ -65,7 +66,7 @@ Forwarded: no
$(CODES): $(CODES_Objects) $(COMMON_LIB)
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
-@@ -603,7 +603,7 @@
+@@ -675,7 +675,7 @@ examples: include_generic
message_file: $(FIREBIRD_MSG)
$(FIREBIRD_MSG): $(BUILD_FILE) msg.timestamp
@@ -73,11 +74,11 @@ Forwarded: no
+ $(call LOCK_RUN,$(BUILD_FILE) -d msg.fdb -f $@)
$(CHMOD_6) $@
- $(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB)
-diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in.examples Firebird-3.0.7.33374-0/builds/posix/Makefile.in.examples
---- Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in.examples 2020-10-20 08:40:05.000000000 +0000
-+++ Firebird-3.0.7.33374-0/builds/posix/Makefile.in.examples 2022-04-04 17:53:33.598825549 +0000
-@@ -123,8 +123,8 @@ $(EXAMPLES_DEST)% : $(EXAMPLES_SRC)%
+ 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)
@@ -88,7 +89,7 @@ diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in.examp
-$(CHMOD_6) $(EMPLOYEE_DB)
# To get past the fact isql is called from the programs, we create a local link in this directory
-@@ -140,7 +140,7 @@ $(EXAMPLES_DEST)/empbuild.c: $(EXAMPLES_
+@@ -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
@@ -97,7 +98,7 @@ diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in.examp
# 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
-@@ -148,7 +148,7 @@ $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPL
+@@ -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
@@ -106,7 +107,7 @@ diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in.examp
-$(CHMOD_6) intlemp.fdb
$(EXAMPLES_DEST)/intlbld$(EXEC_EXT): $(INTLBLD_Objects) $(COMMON_LIB)
-@@ -158,7 +158,7 @@ $(EXAMPLES_DEST)/intlbld.c: $(EXAMPLES_D
+@@ -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
@@ -115,21 +116,21 @@ diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/Makefile.in.examp
$(EXAMPLES_DEST)/%.sql: $(EXAMPLES_SRC)/empbuild/%.sql
-diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/make.defaults Firebird-3.0.7.33374-0/builds/posix/make.defaults
---- Firebird-3.0.7.33374-0.org/builds/posix/make.defaults 2022-04-04 17:53:31.949821738 +0000
-+++ Firebird-3.0.7.33374-0/builds/posix/make.defaults 2022-04-04 17:53:33.598825549 +0000
-@@ -397,6 +397,7 @@ GPRE_BOOT = $(RBIN)/gpre_boot$(EXE
+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
-diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/make.rules Firebird-3.0.7.33374-0/builds/posix/make.rules
---- Firebird-3.0.7.33374-0.org/builds/posix/make.rules 2020-10-20 08:40:05.000000000 +0000
-+++ Firebird-3.0.7.33374-0/builds/posix/make.rules 2022-04-04 17:53:33.598825549 +0000
-@@ -72,17 +72,17 @@ ISQL_GPRE_FLAGS = -m -z -n -ocxx
+ 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:
@@ -142,16 +143,20 @@ diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/make.rules Firebi
+ $(call LOCK_RUN,$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $(firstword $<) $@)
$(OBJ)/isql/%.cpp: $(SRC_ROOT)/isql/%.epp
-- $(GPRE_CURRENT) $(ISQL_GPRE_FLAGS) $< $@
-+ $(call LOCK_RUN,$(GPRE_CURRENT) $(ISQL_GPRE_FLAGS) $< $@)
+- $(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
-diff -urNp -x '*.orig' Firebird-3.0.7.33374-0.org/builds/posix/make.shared.targets Firebird-3.0.7.33374-0/builds/posix/make.shared.targets
+ .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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Firebird.git/commitdiff/eee53b00731af98a74bce9818a77911045df0ad1
More information about the pld-cvs-commit
mailing list