From 4a1eb8f722f1db3bfd20b9cb13d6805fb789503e Mon Sep 17 00:00:00 2001 From: Zhongling He Date: Thu, 21 Apr 2022 07:39:09 +0000 Subject: [PATCH] fix guile build failure Signed-off-by: Zhongling He --- ...j.h-and-some-other-headers-in-single.patch | 61 +++++++++++++++++++ gc.spec | 7 ++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 0001-Distribute-gc_gcj.h-and-some-other-headers-in-single.patch diff --git a/0001-Distribute-gc_gcj.h-and-some-other-headers-in-single.patch b/0001-Distribute-gc_gcj.h-and-some-other-headers-in-single.patch new file mode 100644 index 0000000..70fd192 --- /dev/null +++ b/0001-Distribute-gc_gcj.h-and-some-other-headers-in-single.patch @@ -0,0 +1,61 @@ +From c876dc2b12fcfd65466b9aa42349cfb621064971 Mon Sep 17 00:00:00 2001 +From: Jakub Wojciech +Date: Fri, 5 Nov 2021 08:36:32 +0100 +Subject: [PATCH] Distribute gc_gcj.h and some other headers in + single-obj-compilation + +Issue #389 (bdwgc). + +This fixes installation of gc_pthread_redirects.h, gc_gcj.h and +gc_disclaim.h if --single-obj-compilation is passed to configure. + +* Makefile.am [PTHREADS] (pkginclude_HEADERS): Move outside the +SINGLE_GC_OBJ conditional. +* Makefile.am [ENABLE_GCJ_SUPPORT] (pkginclude_HEADERS): Likewise. +* Makefile.am [ENABLE_DISCLAIM] (pkginclude_HEADERS): Likewise. + +diff --git a/Makefile.am b/Makefile.am +index e3230c1d..f557fe12 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -83,7 +83,6 @@ else + if PTHREADS + # Not Cygwin or MinGW. + libgc_la_SOURCES += pthread_start.c pthread_support.c +-pkginclude_HEADERS += include/gc_pthread_redirects.h + if DARWIN_THREADS + libgc_la_SOURCES += darwin_stop_world.c + else +@@ -106,17 +105,27 @@ endif + + if ENABLE_GCJ_SUPPORT + libgc_la_SOURCES += gcj_mlc.c +-pkginclude_HEADERS += include/gc_gcj.h + endif + + if ENABLE_DISCLAIM + libgc_la_SOURCES += fnlz_mlc.c +-pkginclude_HEADERS += include/gc_disclaim.h + endif + + ## End of !SINGLE_GC_OBJ + endif + ++if PTHREADS ++pkginclude_HEADERS += include/gc_pthread_redirects.h ++endif ++ ++if ENABLE_GCJ_SUPPORT ++pkginclude_HEADERS += include/gc_gcj.h ++endif ++ ++if ENABLE_DISCLAIM ++pkginclude_HEADERS += include/gc_disclaim.h ++endif ++ + if USE_INTERNAL_LIBATOMIC_OPS + nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c + endif +-- +2.35.1 + diff --git a/gc.spec b/gc.spec index 21c562c..7c7621b 100644 --- a/gc.spec +++ b/gc.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 Summary: Garbage collector for C and C++ Name: gc Version: 8.2.0 @@ -8,6 +8,8 @@ License: BSD URL: https://www.hboehm.info/gc/ Source0: https://github.com/ivmai/bdwgc/releases/download/v%{version}/gc-%{version}%{?pre}.tar.gz +Patch0001: 0001-Distribute-gc_gcj.h-and-some-other-headers-in-single.patch + BuildRequires: automake libtool BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -88,5 +90,8 @@ make check %{?arch_ignore} %changelog +* Wed Apr 21 2022 Zhongling He 8.2.0-2 +- Backport c876dc2 from upstream to fix some headers not installed. + * Wed Apr 13 2022 Zhongling He 8.2.0-1 - Init package from upstream v8.2.0 -- Gitee