[packages/Firebird] - added patch to link with shared libstdc++, versioned Obsoletes

qboosh qboosh at pld-linux.org
Sat Jun 15 14:49:27 CEST 2024


commit 812d5e19e31e87b5f6e1a1a2a305e8d1223b7af6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 15 14:04:07 2024 +0200

    - added patch to link with shared libstdc++, versioned Obsoletes

 Firebird-shared-libstdc++.patch | 13 +++++++++++++
 Firebird.spec                   |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/Firebird.spec b/Firebird.spec
index 22f6917..24c1eac 100644
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -63,6 +63,7 @@ Patch1:		%{name}-editline.patch
 Patch2:		%{name}-va.patch
 Patch3:		%{name}-FHS.patch
 Patch4:		%{name}-opt.patch
+Patch5:		%{name}-shared-libstdc++.patch
 Patch6:		%{name}-libpath.patch
 Patch7:		add-pkgconfig-files.patch
 Patch10:	no-copy-from-icu.patch
@@ -150,7 +151,7 @@ Group:		Development/Libraries
 Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	%{name}-lib = %{version}-%{release}
 Requires:	libstdc++-devel
-Obsoletes:	Firebird-static
+Obsoletes:	Firebird-static < 3
 
 %description devel
 Header files for Firebird library.
@@ -202,6 +203,7 @@ Skrypty startowe Firebirda w wersji Classic (inetd).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch11 -p1
diff --git a/Firebird-shared-libstdc++.patch b/Firebird-shared-libstdc++.patch
new file mode 100644
index 0000000..11bee34
--- /dev/null
+++ b/Firebird-shared-libstdc++.patch
@@ -0,0 +1,13 @@
+--- Firebird-5.0.0.1306-0-source/builds/posix/make.defaults.orig	2024-01-11 11:24:21.000000000 +0100
++++ Firebird-5.0.0.1306-0-source/builds/posix/make.defaults	2024-06-15 08:18:46.395554408 +0200
+@@ -207,8 +207,8 @@ ifeq ($(PLATFORM),DARWIN)
+ LIB_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS) $(WLDFLAGS)
+ EXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS) $(WLDFLAGS)
+ else
+-LIB_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS) $(WLDFLAGS) -static-libstdc++
+-EXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS) $(WLDFLAGS) -static-libstdc++
++LIB_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS) $(WLDFLAGS)
++EXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS) $(WLDFLAGS)
+ endif
+ 
+ STATICLIB_LINK = $(AR) crus
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Firebird.git/commitdiff/812d5e19e31e87b5f6e1a1a2a305e8d1223b7af6



More information about the pld-cvs-commit mailing list