[packages/log4cplus] - added link patch to link python modules with newly built library; release 2

qboosh qboosh at pld-linux.org
Fri Jun 14 22:48:58 CEST 2024


commit eeb928f1c14951a0f3a4164cf89856810ba32a00
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jun 14 22:47:23 2024 +0200

    - added link patch to link python modules with newly built library; release 2

 log4cplus-link.patch | 24 ++++++++++++++++++++++++
 log4cplus.spec       |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/log4cplus.spec b/log4cplus.spec
index 3ee5727..cb6dfe9 100644
--- a/log4cplus.spec
+++ b/log4cplus.spec
@@ -15,13 +15,14 @@ Summary:	Logging Framework for C++
 Summary(pl.UTF-8):	Szkielet logowania dla C++
 Name:		log4cplus
 Version:	2.1.1
-Release:	1
+Release:	2
 License:	BSD or Apache v2.0
 Group:		Libraries
 Source0:	https://downloads.sourceforge.net/log4cplus/%{name}-%{version}.tar.xz
 # Source0-md5:	6ee2555be39cd269086cc871c834e43f
 Patch0:		%{name}-amfix.patch
 Patch1:		%{name}-swig.patch
+Patch2:		%{name}-link.patch
 URL:		https://sourceforge.net/projects/log4cplus/
 %{?with_qt4:BuildRequires:	QtCore-devel >= 4.0.0}
 %{?with_qt5:BuildRequires:	Qt5Core-devel >= 5.0.0}
@@ -180,6 +181,7 @@ Wiązania Pythona/SWIG do biblioteki log4cplus.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/log4cplus-link.patch b/log4cplus-link.patch
new file mode 100644
index 0000000..0ecda22
--- /dev/null
+++ b/log4cplus-link.patch
@@ -0,0 +1,24 @@
+--- log4cplus-2.1.1/swig/python/Makefile.am.orig	2024-06-14 20:18:51.588346277 +0200
++++ log4cplus-2.1.1/swig/python/Makefile.am	2024-06-14 21:12:18.190422810 +0200
+@@ -9,8 +9,8 @@ _log4cplus_la_CPPFLAGS = $(AM_CPPFLAGS)
+   $(PYTHON_CPPFLAGS) -DSWIG_TYPE_TABLE=log4cplus \
+   "-Dregister=/*register*/"
+ _log4cplus_la_LDFLAGS = -no-undefined -shared -module -avoid-version \
+-  $(PYTHON_LDFLAGS) $(AM_LDFLAGS)
+-_log4cplus_la_LIBADD = $(liblog4cplus_la_file)
++  $(AM_LDFLAGS)
++_log4cplus_la_LIBADD = $(liblog4cplus_la_file) $(PYTHON_LDFLAGS)
+ 
+ $(PYTHON_WRAP_CXX): $(SWIG_SOURCES)
+ 	$(SWIG) $(SWIG_FLAGS) -c++ -python $(SWIG_PYTHON_OPT) \
+@@ -29,8 +29,8 @@ _log4cplusU_la_CPPFLAGS = $(AM_CPPFLAGS)
+   $(SWIG_PYTHON_CPPFLAGS) $(PYTHON_CPPFLAGS) -DSWIG_TYPE_TABLE=log4cplus \
+   "-Dregister=/*register*/"
+ _log4cplusU_la_LDFLAGS = -no-undefined -shared -module -avoid-version \
+-  $(PYTHON_LDFLAGS) $(AM_LDFLAGS)
+-_log4cplusU_la_LIBADD = $(liblog4cplusU_la_file)
++  $(AM_LDFLAGS)
++_log4cplusU_la_LIBADD = $(liblog4cplusU_la_file) $(PYTHON_LDFLAGS)
+ 
+ $(PYTHON_WRAPU_CXX): $(SWIG_SOURCES)
+ 	$(SWIG) -DUNICODE=1 -D_UNICODE=1 $(SWIG_FLAGS) -c++ -python $(SWIG_PYTHON_OPT) \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/log4cplus.git/commitdiff/eeb928f1c14951a0f3a4164cf89856810ba32a00



More information about the pld-cvs-commit mailing list