summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gc-8.2.6-make-atomic_ops_private.patch26
-rw-r--r--gc.spec6
2 files changed, 23 insertions, 9 deletions
diff --git a/gc-8.2.6-make-atomic_ops_private.patch b/gc-8.2.6-make-atomic_ops_private.patch
index 6437575..8bced81 100644
--- a/gc-8.2.6-make-atomic_ops_private.patch
+++ b/gc-8.2.6-make-atomic_ops_private.patch
@@ -1,10 +1,20 @@
---- gc-8.2.6/bdw-gc.pc.in.orig 2024-08-23 11:31:18.009298200 +0800
-+++ gc-8.2.6/bdw-gc.pc.in 2024-08-23 11:32:17.714253900 +0800
-@@ -6,5 +6,6 @@
- Name: Boehm-Demers-Weiser Conservative Garbage Collector
- Description: A garbage collector for C and C++
+--- gc-8.2.6/bdw-gc.pc.in.orig 2024-08-26 18:30:05.325340608 +0800
++++ gc-8.2.6/bdw-gc.pc.in 2024-08-26 18:31:06.229053989 +0800
+@@ -8,3 +8,4 @@
Version: @PACKAGE_VERSION@
--Libs: -L${libdir} @ATOMIC_OPS_LIBS@ -lgc @THREADDLLIBS@
-+Libs: -L${libdir} -lgc @THREADDLLIBS@
-+Libs.private: @ATOMIC_OPS_LIBS@
+ Libs: -L${libdir} @ATOMIC_OPS_LIBS@ -lgc @THREADDLLIBS@
Cflags: -I${includedir}
++Requires.private: @ATOMIC_OPS_PC@
+--- gc-8.2.6/configure.ac.orig 2024-08-26 18:29:38.237023314 +0800
++++ gc-8.2.6/configure.ac 2024-08-26 18:40:16.461498875 +0800
+@@ -1129,7 +1129,9 @@
+ [ AS_IF([test x"$with_libatomic_ops" != xnone -a x"$THREADS" != xnone],
+ [ AC_MSG_RESULT([external])
+ ATOMIC_OPS_LIBS="-latomic_ops"
+- AC_SUBST([ATOMIC_OPS_LIBS]) ],
++ ATOMIC_OPS_PC="atomic_ops"
++ AC_SUBST([ATOMIC_OPS_LIBS])
++ AC_SUBST([ATOMIC_OPS_PC]) ],
+ [ AC_MSG_RESULT([none])
+ AS_IF([test x"$THREADS" != xnone],
+ [ AC_DEFINE([GC_BUILTIN_ATOMIC], [1],
diff --git a/gc.spec b/gc.spec
index 54d3c52..237c95e 100644
--- a/gc.spec
+++ b/gc.spec
@@ -1,6 +1,6 @@
Name: gc
Version: 8.2.6
-Release: 3
+Release: 4
Summary: A garbage collector for C and C++
License: BSD-3-Clause
Url: http://www.hboehm.info/gc/
@@ -20,6 +20,7 @@ used as a garbage collecting replacement for C malloc or C++ new.
%package devel
Summary: Libraries and header files for %{name} development
Requires: %{name}%{?_isa} = %{version}-%{release}
+
%description devel
%{summary}.
@@ -78,6 +79,9 @@ rm -rfv %{buildroot}%{_datadir}/gc/
%{_mandir}/man3/gc.3*
%changelog
+* Mon Aug 26 2024 Funda Wang <fundawang@yeah.net> - 8.2.6-4
+- move atomic_ops into requires.private rather than libs.private
+
* Fri Aug 23 2024 Funda Wang <fundawang@yeah.net> - 8.2.6-3
- move atomic_ops libs into private so that it won't confuse downstream packages