From 4c2b6d0cf04c56c2faa47e1ad2d86381d9b353a87b7082d40dc4986c49ef187e Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 2 Dec 2021 23:00:10 +0000
Subject: [PATCH] Accepting request 935274 from
 home:jengelh:branches:devel:libraries:c_c++

- Add 0001-Distribute-gc_gcj.h-and-some-other-headers-in-single.patch
  to repair `make install` forgetting to install gc_pthread.h.
- Drop C++98 build mode; just use what g++ uses.

OBS-URL: https://build.opensuse.org/request/show/935274
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gc?expand=0&rev=44
---
 ...j.h-and-some-other-headers-in-single.patch | 64 +++++++++++++++++++
 gc.changes                                    |  7 ++
 gc.spec                                       |  7 +-
 3 files changed, 75 insertions(+), 3 deletions(-)
 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..56710a4
--- /dev/null
+++ b/0001-Distribute-gc_gcj.h-and-some-other-headers-in-single.patch
@@ -0,0 +1,64 @@
+From c876dc2b12fcfd65466b9aa42349cfb621064971 Mon Sep 17 00:00:00 2001
+From: Jakub Wojciech <jakub-w@riseup.net>
+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.
+---
+ Makefile.am | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git Makefile.am Makefile.am
+index e3230c1d..f557fe12 100644
+--- Makefile.am
++++ 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.34.0
+
diff --git a/gc.changes b/gc.changes
index 31af59e..62c64fd 100644
--- a/gc.changes
+++ b/gc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Dec  2 17:28:08 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Add 0001-Distribute-gc_gcj.h-and-some-other-headers-in-single.patch
+  to repair `make install` forgetting to install gc_pthread.h.
+- Drop C++98 build mode; just use what g++ uses.
+
 -------------------------------------------------------------------
 Wed Sep 29 22:03:07 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/gc.spec b/gc.spec
index a52cb35..a25138b 100644
--- a/gc.spec
+++ b/gc.spec
@@ -26,6 +26,7 @@ URL:            http://www.hboehm.info/gc/
 
 #Git-Clone:	https://github.com/ivmai/bdwgc
 Source:         https://github.com/ivmai/bdwgc/releases/download/v%version/%name-%version.tar.gz
+Patch1:         0001-Distribute-gc_gcj.h-and-some-other-headers-in-single.patch
 BuildRequires:  autoconf >= 2.64
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
@@ -73,14 +74,14 @@ automatically recycles memory when it determines that it can no longer
 be otherwise accessed.
 
 %prep
-%autosetup -p1
+%autosetup -p0
 
 %build
 autoreconf -fi
 
 # see bugzilla.redhat.com/689877
 export CPPFLAGS="-DUSE_GET_STACKBASE_FOR_MAIN"
-export CXXFLAGS="%optflags -std=gnu++98"
+export CXXFLAGS="%optflags"
 %configure --disable-static --docdir="%_docdir/%name" \
     --with-gnu-ld	    \
     --enable-cplusplus	    \
@@ -90,7 +91,7 @@ export CXXFLAGS="%optflags -std=gnu++98"
     --with-libatomic-ops=yes
 # --with-libatomic-ops=yes means to use the system library
 
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install