Hello Sebastien,
Looks good to me.
But I suggest also to fix a typo in devel/boehm-gc/pkg/DESCR-atomic: 'ia also' -> 'is also'
Regards,
Ivan
>Sat, 17 Jun 2023, 7:44 +03:00 from Sebastien Marie <semarie@online.fr>:
>
>On Wed, Jun 14, 2023 at 07:13:46AM +0100, Stuart Henderson wrote:
>> On 2023/06/14 07:13, Sebastien Marie wrote:
>> > On Tue, Jun 13, 2023 at 12:58:07PM +0300, Ivan Maidanski wrote:
>> > >
>> > > Hello,
>> > >
>> > > I have prepared a draft patch — https://github.com/ivmai/openbsd-ports/commit/ea1d6444fc0b4435bc76c8c56867cc40c18848a9
>> > > Tested (make check) on mips64 and amd64 (OpenBSD 7.3).
>>
>> > Some aspects on your diff might need more checking (SHARED_LIBS, and testing
>> > ports depending of boehm-gc), but I will take care of that (at some point, I am
>> > a bit short in time currently).
>>
>> Thanks, I'll try to take a closer look soon too.
>>
>I check SHARED_LIBS:
>- gctba is new, start at 0.0
>- gc changed (major)
>- no changes for others (according to src/lib/check_sym)
>
>And I build tested all direct dependencies on amd64 (editors/poke
>graphics/asymptote graphics/inkscape lang/crystal lang/ecl lang/guile2
>lang/guile3 lang/haxe lang/nekovm print/a2ps www/w3m) without problems.
>
>
>I have the following diff which I would like to commit.
>
>
>diff /home/semarie/repos/openbsd/ports
>commit - 711b71c755c32ab25aa80f261d29372b39a9411f
>path + /home/semarie/repos/openbsd/ports
>blob - 394932012ba9d1946a28dd25c8357f07508b340a
>file + devel/boehm-gc/Makefile
>--- devel/boehm-gc/Makefile
>+++ devel/boehm-gc/Makefile
>@@ -1,9 +1,9 @@
> COMMENT-main= garbage collection and memory leak detection for C and C++
> COMMENT-atomic= access to hardware provided atomic memory operations
>
>-VERSION= 8.0.4
>-LIBAO_VERSION= 7.6.10
>-REVISION= 0
>+VERSION= 8.2.4
>+LIBAO_VERSION= 7.8.0
>+
> # has various machine-dependent parts; updates definitely need
> # tests on more than just amd64.
>
>@@ -13,20 +13,22 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
> PKGNAME-main= boehm-gc-${VERSION}
>
> DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
>- libatomic_ops-${LIBAO_VERSION}${EXTRACT_SUFX}
>+ libatomic_ops-${LIBAO_VERSION}${EXTRACT_SUFX}:0
>
> MULTI_PACKAGES= -main -atomic
> DEBUG_PACKAGES= ${BUILD_PACKAGES}
>
>-SHARED_LIBS += gc 5.0 # 5.3
>+SHARED_LIBS += gc 6.0 # 6.2
> SHARED_LIBS += gccpp 1.0 # 5.0
>-SHARED_LIBS += cord 3.0 # 5.0
>-SHARED_LIBS += atomic_ops 3.0 # 2.1
>-SHARED_LIBS += atomic_ops_gpl 3.0 # 2.2
>+SHARED_LIBS += gctba 0.0 # 5.0
>+SHARED_LIBS += cord 3.0 # 6.0
>+SHARED_LIBS += atomic_ops 3.0 # 3.0
>+SHARED_LIBS += atomic_ops_gpl 3.0 # 3.0
>
> CATEGORIES= devel
>
>-MASTER_SITES= https://hboehm.info/gc/gc_source/
>+MASTER_SITES= https://github.com/ivmai/bdwgc/releases/download/v${VERSION}/
>+MASTER_SITES0= https://github.com/ivmai/libatomic_ops/releases/download/v${LIBAO_VERSION}/
>
> HOMEPAGE= https://hboehm.info/gc/
>
>@@ -36,9 +38,9 @@ WANTLIB-main += m pthread ${COMPILER_LIBCXX}
> # HP MIT-like license
> PERMIT_PACKAGE= Yes
>
>-WANTLIB-main += m pthread ${COMPILER_LIBCXX}
>+WANTLIB-main += m pthread ${COMPILER_LIBCXX}
>
>-COMPILER = base-clang ports-gcc base-gcc
>+COMPILER = base-clang ports-gcc base-gcc
>
> MAKE_ENV= CP="cp" \
> INSTALL_DATA="${INSTALL_DATA}" \
>blob - 9778dcfee96302231023c0a7b03e3d6f0d70f9d2
>file + devel/boehm-gc/distinfo
>--- devel/boehm-gc/distinfo
>+++ devel/boehm-gc/distinfo
>@@ -1,4 +1,4 @@
>-SHA256 (gc-8.0.4.tar.gz) = Q2oN3GexrAsEBbYalnW8qeB1yBVvTevR0G86VsfNKJ0=
>-SHA256 (libatomic_ops-7.6.10.tar.gz) = WH7fYIF/Vtrx4as4pLPHKbjoRv9ntPYqYVcYNwjwma8=
>-SIZE (gc-8.0.4.tar.gz) = 1160528
>-SIZE (libatomic_ops-7.6.10.tar.gz) = 503734
>+SHA256 (gc-8.2.4.tar.gz) = PQ082+B3QD0xBrtA8Mu1Y0E9bv27Kn4c1ohlld7Ej8I=
>+SHA256 (libatomic_ops-7.8.0.tar.gz) = FWdudnThG9paflCnP02efWBFInG4rPb9Oacf79+J+jE=
>+SIZE (gc-8.2.4.tar.gz) = 1210929
>+SIZE (libatomic_ops-7.8.0.tar.gz) = 526300
>blob - 51cfdcf24f6a488850e3b0f9b28275ca63e777fe
>file + devel/boehm-gc/patches/patch-Makefile_in
>--- devel/boehm-gc/patches/patch-Makefile_in
>+++ devel/boehm-gc/patches/patch-Makefile_in
>@@ -1,17 +1,12 @@
> Index: Makefile.in
>-
>-PARALLEL MAKE BUG
>-Fix build race: Our make(1) treats ./libgc.la and libgc.la as distinct
>-targets.
>-
> --- Makefile.in.orig
> +++ Makefile.in
>-@@ -1345,7 +1345,7 @@ libatomic_ops/src/atomic_ops_sysdeps.lo: \
>- libatomic_ops/src/atomic_ops.lo: libatomic_ops/src/$(am__dirstamp) \
>+@@ -1448,7 +1448,7 @@ libatomic_ops/src/atomic_ops_sysdeps.lo: \
>+ libatomic_ops/src/$(am__dirstamp) \
> libatomic_ops/src/$(DEPDIR)/$(am__dirstamp)
>
> -libgc.la: $(libgc_la_OBJECTS) $(libgc_la_DEPENDENCIES) $(EXTRA_libgc_la_DEPENDENCIES)
>-+libgc.la ./libgc.la: $(libgc_la_OBJECTS) $(libgc_la_DEPENDENCIES) $(EXTRA_libgc_la_DEPENDENCIES)
>++libgc.la ./libgc.la: $(libgc_la_OBJECTS) $(libgc_la_DEPENDENCIES) $(EXTRA_libgc_la_DEPENDENCIES)
> $(AM_V_CCLD)$(libgc_la_LINK) -rpath $(libdir) $(libgc_la_OBJECTS) $(libgc_la_LIBADD) $(LIBS)
>
> libgccpp.la: $(libgccpp_la_OBJECTS) $(libgccpp_la_DEPENDENCIES) $(EXTRA_libgccpp_la_DEPENDENCIES)
>blob - eb3ad99a5f519921d59fcfbd2071c60ab24a7eee
>file + /dev/null
>--- devel/boehm-gc/patches/patch-bdw-gc_pc_in
>+++ /dev/null
>@@ -1,10 +0,0 @@
>-Index: bdw-gc.pc.in
>---- bdw-gc.pc.in.orig
>-+++ bdw-gc.pc.in
>-@@ -6,5 +6,5 @@ includedir=@includedir@
>- Name: Boehm-Demers-Weiser Conservative Garbage Collector
>- Description: A garbage collector for C and C++
>- Version: @PACKAGE_VERSION@
>--Libs: -L${libdir} @ATOMIC_OPS_LIBS@ -lgc
>-+Libs: -L${libdir} @ATOMIC_OPS_LIBS@ -lgc -pthread
>- Cflags: -I${includedir}
>blob - 085885f143f5e2b1e688ccb335c11be9b7454583
>file + devel/boehm-gc/patches/patch-dyn_load_c
>--- devel/boehm-gc/patches/patch-dyn_load_c
>+++ devel/boehm-gc/patches/patch-dyn_load_c
>@@ -3,7 +3,7 @@ Index: dyn_load.c
> Index: dyn_load.c
> --- dyn_load.c.orig
> +++ dyn_load.c
>-@@ -81,13 +81,6 @@ STATIC GC_has_static_roots_func GC_has_static_roots =
>+@@ -82,13 +82,6 @@ STATIC GC_has_static_roots_func GC_has_static_roots =
> # define ELFSIZE ARCH_ELFSIZE
>
No comments:
Post a Comment