CVS commit: pkgsrc

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Sat Jan 14 01:30:53 UTC 2023

Modified Files:
        pkgsrc/devel/gnustep-objc: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/devel/gnustep-objc/patches: patch-objc_runtime.h
            patch-objcxx_eh.cc patch-objcxx_eh.h
        pkgsrc/doc: CHANGES-2023
Added Files:
        pkgsrc/devel/gnustep-objc/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/devel/gnustep-objc/patches: patch-GNUmakefile

Log Message:
Update devel/gnustep-objc to 2.1.0 and fix its build

Highlights of 2.1.0 release include:

- Numerous improvements to the Objective-C++ exception interoperation code.
  The runtime now dynamically detects whether the libcxxrt or libsupc++ variant
  of the Itanium C++ Exception ABI is being used

- Sending a message to `super` where the corresponding method did not exist was
  silently ignored in previous versions of the runtime.  This now correctly
  invokes the forwarding hooks and so (with an implementation of the Foundation
  framework, such as GNUstep Base or WinObjC) will trigger an exception or
  invoke `forwardInvocation:`.

- The checks for overloaded memory management methods were incorrect, causing
  some classes to be incorrectly opted into ARC fast paths.  These checks are
  now correct.

- Several memory management bugs in corner cases of weak reference management
  were fixed.

- The ARM assembly implementation of `objc_msgSend` now correctly restores the
  stack after calling a forwarding implementation.  This bug caused stack
  corruption and usually crashing on ARM.

- The ARC code has been rewritten as C++, using a well-tested third-party
  Robin-Hood hash table to store weak references, replacing the home-grown
  version.  This improves performance and reduces the likelihood of bugs
  arising from the hash table implementation.

- Control Flow Guard (CGF) checks were added on Windows on x86 (32- and
  64-bit).  If Objective-C code is compiled with CFG enabled then
  `objc_msgSend` will crash if it attempts to jump to an address that is not a
  valid function entry point.

- The function signatures in the blocks headers were updated for compatibility
  with recent macOS releases.

- Support for the C11 _Atomic type qualifier in property metadata was added.

Highlights of 2.0.0 release include:

- The linker now removes duplicate selectors within a library.

- The linker will remove duplicate protocol definitions within a library.

- Protocols and classes are now always accessed via an indirection layer, so
  they can be extended by future versions of the ABI without breaking
  compatibility.

- Categories can include property metadata and both categories.

- Constant strings are now emitted with a richer structure, which provides
  faster hashing and better unicode support.

- Instance variable metadata includes size and alignment, allowing better object
  layout and more accurate introspection.  Instance variable metadata now
  includes more accurate information about ARC ownership semantics.

- Method metadata now includes extended type information, allowing bridged
  languages to understand the class that methods expect and not just the fact
  that they take an object.  This was previously an obstacle to supporting
  JavaScriptCore's Objective-C bridge with GNUstep.

In addition to the new ABI, there are several improvements on Windows:

- The runtime now uses SEH-based exception handling on Windows.  This
  interoperates with C++ exceptions in libraries compiled with MSVC or
  MSVC-compatible compilers.

- All of the assembly code paths now fully support i386 and x64 Windows.

- Object allocations on 32-bit Windows now use `_aligned_malloc` to guarantee
  sufficient alignment for AVX vectors in instance variables.

- The runtime now uses fibre-local storage and critical sections on Windows,
  improving performance in multithreaded workloads on Windows.

- Public runtime functions are now marked dllexport, so the runtime can be built
  as objc.dll on Windows.

**WARNING**: The new ABI is currently incompatible with incremental linking on
Windows, so projects built with Microsoft's linker must disable incremental
linking.

Note: Microsoft's WinObjC project contains a friendly fork of this library that
includes a work around for the incremental linking issue.  If you wish to use
incremental linking on Windows, please use that version.  A subsequent version
of clang and link.exe should include a fix that will make it possible to use
this version with incremental linking.

The runtime will now use the new ABI's data structures internally and will
automatically upgrade on-disk structures from old ABIs when used with the old
ABI.  As a result, memory usage will be higher when using the old ABI and users
who are unable to recompile their code may prefer to stick with the 1.9.x
release series.  Mixing libraries compiled with the old and new ABIs is not
supported and will abort at run time.

The new ABI provides better run-time introspection metadata and smaller
binaries.  When used with the new ABI, this version of the runtime will consume
less memory than the previous release.

Highlights of 1.9.0 release include:

- Support for 64-bit ARM (AArch64) processors, including assembly fast paths
  for message sending.

- Improved the dispatch table representation to improve performance and cache
  usage on the fast path.

- The implementation of `imp_implementationWithBlock`, the function that allows
  blocks to be used as methods, no longer requires physical pages to be mapped
  both writeable and executable.

- Numerous improvements to the interaction between runtime functions and ARC.

- Support for Thumb-2 interworking on ARM.  Note that the library must be
  compiled for ARMv7 or ARMv6T2 for this code to be enabled.  Once it has been,
  other Objective-C binaries linked with the library can be compiled as ARM or
  Thumb-2 code.  This will also generate Thumb-2 message send functions,
  improving instruction cache usage.

- Significant improvements to ARC, including

  * The runtime no longer acquires a global lock on every object deallocation (a
    global lock is still used for objects that have weak references). *NOTE:*
    This is incompatible with other code directly inspecting the reference
    count and will break with older versions of GNUstep Base!

  * Weak references use a scheme closer to C++ `std::weak_pointer` and are
    lazily zeroed on access.  This reduces the space overheads for weak
    references.

  * Some additional helper functions are added for use in `NSObject` and other
    root classes,  which simplifies the layering between the runtime and the
    Foundation (or equivalent) implementation.

- Improvements to how the runtime handles layout of ivars with strong alignment
  requirements, which should fix issues relating to using vector types in
  Objective-C objects.

- The option to build a separate libobjcxx has been removed.  The runtime will
  now depend on the C++ standard library implementation if no useable C++
  runtime is available.  Note that C++ exception interworking does not work
  because LLVM's libc++abi (shipped by Apple) does not provide GNU-compatible
  hooks and so Objective-C++ exception support will be automatically disabled
  on this platform.  Any other platforms shipping libc++abi should consider
  either GNU libsupc++ or libcxxrt as an alternative


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/gnustep-objc/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/gnustep-objc/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/gnustep-objc/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/gnustep-objc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gnustep-objc/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.4 -r0 pkgsrc/devel/gnustep-objc/patches/patch-GNUmakefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/gnustep-objc/patches/patch-objc_runtime.h
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc \
    pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h
cvs rdiff -u -r1.326 -r1.327 pkgsrc/doc/CHANGES-2023

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gnustep-objc/Makefile
diff -u pkgsrc/devel/gnustep-objc/Makefile:1.36 pkgsrc/devel/gnustep-objc/Makefile:1.37
--- pkgsrc/devel/gnustep-objc/Makefile:1.36     Sun Nov 28 15:45:13 2021
+++ pkgsrc/devel/gnustep-objc/Makefile  Sat Jan 14 01:30:53 2023
@@ -1,19 +1,27 @@
-# $NetBSD: Makefile,v 1.36 2021/11/28 15:45:13 pho Exp $
+# $NetBSD: Makefile,v 1.37 2023/01/14 01:30:53 manu Exp $
 
-DISTNAME=      libobjc2-1.8.1
+DISTNAME=      libobjc2-2.1.0
 PKGNAME=       ${DISTNAME:S/libobjc2/gnustep-objc/}
 CATEGORIES=    devel gnustep
-MASTER_SITES=  ${MASTER_SITE_GNUSTEP:=libs/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=gnustep/}
+GITHUB_PROJECT=        libobjc2
+GITHUB_TAG=    v2.1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/gnustep/libobjc2
 COMMENT=       Objective-C runtime
 LICENSE=       mit
 
+BUILD_DEPENDS+=        clang-[0-9]*:../../lang/clang
+
 USE_LANGUAGES=                 objc c++11
-USE_TOOLS+=                    gmake cmake
-MAKE_FILE=                     GNUmakefile
-MAKE_ENV+=                     ADDITIONAL_LDFLAGS=-lpthread
+USE_TOOLS+=                    gmake cmake pax
+USE_CMAKE=                     yes
+CMAKE_ARGS+=                   -DCMAKE_C_COMPILER=${CLANGBASE:Q}/bin/clang
+CMAKE_ARGS+=                   -DCMAKE_CXX_COMPILER=${CLANGBASE:Q}/bin/clang++
+LDFLAGS+=                      -lm -lunwind -lstdc++
+MAKE_FILE=                     Makefile
+MAKE_ENV+=                     ADDITIONAL_LDFLAGS="-lpthread"
 MAKE_ENV+=                     LIBOBJC=libobjc
 MAKE_ENV+=                     LIBOBJCXX=libobjcxx
 MAKE_ENV+=                     VERSION=4.6
@@ -22,11 +30,14 @@ MAKE_ENV+=                  MINOR_VERSION=6
 
 INSTALLATION_DIRS=             lib include/objc
 
+post-extract:
+       cd ${BUILDLINK_PREFIX.robin-map} && \
+           pax -rwpam include/tsl ${WRKSRC}/third_party/robin-map/
+
 do-configure:
        cd ${WRKSRC} && \
                ${SETENV} ${CONFIGURE_ENV} ${CMAKE} -Wno-dev ${CMAKE_ARGS} .
 
-.include "../../devel/gnustep-make/buildlink3.mk"
 .include "../../mk/compiler.mk"
 
 .include "../../mk/bsd.prefs.mk"
@@ -37,9 +48,12 @@ CMAKE_ARGS+= -DTESTS:BOOL=FALSE
 .endif
 
 PLIST_VARS+=   objcxx
-.if ${OPSYS} != "FreeBSD"
+.if ${OPSYS} != "FreeBSD" && ${OPSYS} != "NetBSD"
 PLIST.objcxx=  yes
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/robin-map/buildlink3.mk"
+.include "../../lang/libunwind/buildlink3.mk"
+.include "../../mk/compiler/clang.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gnustep-objc/PLIST
diff -u pkgsrc/devel/gnustep-objc/PLIST:1.8 pkgsrc/devel/gnustep-objc/PLIST:1.9
--- pkgsrc/devel/gnustep-objc/PLIST:1.8 Wed Nov  4 08:36:52 2020
+++ pkgsrc/devel/gnustep-objc/PLIST     Sat Jan 14 01:30:53 2023
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2020/11/04 08:36:52 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.9 2023/01/14 01:30:53 manu Exp $
+include/Block.h
+include/Block_private.h
 include/objc/Availability.h
 include/objc/Object.h
 include/objc/Protocol.h
@@ -12,14 +14,15 @@ include/objc/message.h
 include/objc/objc-api.h
 include/objc/objc-arc.h
 include/objc/objc-auto.h
+include/objc/objc-class.h
+include/objc/objc-runtime.h
+include/objc/objc-visibility.h
 include/objc/objc.h
 include/objc/runtime-deprecated.h
 include/objc/runtime.h
 include/objc/slot.h
-include/objc/toydispatch.h
 lib/libobjc.so
-lib/libobjc.so.4
 lib/libobjc.so.4.6
 ${PLIST.objcxx}lib/libobjcxx.so
-${PLIST.objcxx}lib/libobjcxx.so.4
 ${PLIST.objcxx}lib/libobjcxx.so.4.6
+lib/pkgconfig/libobjc.pc

Index: pkgsrc/devel/gnustep-objc/buildlink3.mk
diff -u pkgsrc/devel/gnustep-objc/buildlink3.mk:1.14 pkgsrc/devel/gnustep-objc/buildlink3.mk:1.15
--- pkgsrc/devel/gnustep-objc/buildlink3.mk:1.14        Wed Nov  4 08:36:52 2020
+++ pkgsrc/devel/gnustep-objc/buildlink3.mk     Sat Jan 14 01:30:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2020/11/04 08:36:52 triaxx Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2023/01/14 01:30:53 manu Exp $
 
 BUILDLINK_TREE+=       gnustep-objc
 
@@ -12,7 +12,6 @@ BUILDLINK_PKGSRCDIR.gnustep-objc?=    ../..
 BUILDLINK_CFLAGS.gnustep-objc+=                -I${BUILDLINK_PREFIX.gnustep-objc}/include/objc
 BUILDLINK_LDFLAGS.gnustep-objc+=       -lobjc -lpthread
 
-.include "../../devel/gnustep-make/buildlink3.mk"
 .endif # GNUSTEP_OBJC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gnustep-objc

Index: pkgsrc/devel/gnustep-objc/distinfo
diff -u pkgsrc/devel/gnustep-objc/distinfo:1.18 pkgsrc/devel/gnustep-objc/distinfo:1.19
--- pkgsrc/devel/gnustep-objc/distinfo:1.18     Tue Jan  3 17:41:16 2023
+++ pkgsrc/devel/gnustep-objc/distinfo  Sat Jan 14 01:30:53 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2023/01/03 17:41:16 wiz Exp $
+$NetBSD: distinfo,v 1.19 2023/01/14 01:30:53 manu Exp $
 
-BLAKE2s (libobjc2-1.8.1.tar.gz) = 2a19ab2491baa156f7cef635053080dc4bf3eae356f1156a79edb98ebd3c0434
-SHA512 (libobjc2-1.8.1.tar.gz) = 518f36e96a82a076fc67fe384226bd97310cd10a53c7b0951db9f3658aa534582b245d5cb97956fe91c38338c3fc8f1e569dd8af36f6d12e32bf1460251d02eb
-Size (libobjc2-1.8.1.tar.gz) = 173635 bytes
-SHA1 (patch-GNUmakefile) = d9ba0c41e06122326cc6d2579af1db3d3323151d
-SHA1 (patch-objc_runtime.h) = cc8aaeb1352a403abb918aaf5a12d86fdcea383f
-SHA1 (patch-objcxx_eh.cc) = 8804d075cb46380165e40af5f4abd5d8d413b92a
-SHA1 (patch-objcxx_eh.h) = 68a3709ed9d029e6ae4c7a6cc375678ee7c21b1e
+BLAKE2s (libobjc2-2.1.0.tar.gz) = 4812d384515b96a0b837356cd95f68fea492e109ad4166e6159f64b608299f79
+SHA512 (libobjc2-2.1.0.tar.gz) = a93c385f9ad53fce0f736088c3a18e72119c0128690725e435a35fe4250830d13e18899f98c7d80e6ea41cbfe1404f055d9d6c3d891ad7c770d47dcd0244fc7f
+Size (libobjc2-2.1.0.tar.gz) = 200290 bytes
+SHA1 (patch-CMakeLists.txt) = 7b4a6a3c28a332ed96ab08837397455ea699bada
+SHA1 (patch-objc_runtime.h) = af2e2944e825e8982252a878939465a259324030
+SHA1 (patch-objcxx_eh.cc) = 42760e1e3c91d686e13c6705c9b1f86d85a7d2ad
+SHA1 (patch-objcxx_eh.h) = 0ae17a3631d40e5db66ef0f0f09818d7fdc03d80

Index: pkgsrc/devel/gnustep-objc/patches/patch-objc_runtime.h
diff -u pkgsrc/devel/gnustep-objc/patches/patch-objc_runtime.h:1.1 pkgsrc/devel/gnustep-objc/patches/patch-objc_runtime.h:1.2
--- pkgsrc/devel/gnustep-objc/patches/patch-objc_runtime.h:1.1  Wed Jan 26 15:57:54 2022
+++ pkgsrc/devel/gnustep-objc/patches/patch-objc_runtime.h      Sat Jan 14 01:30:53 2023
@@ -1,12 +1,13 @@
-$NetBSD: patch-objc_runtime.h,v 1.1 2022/01/26 15:57:54 tm Exp $
+$NetBSD: patch-objc_runtime.h,v 1.2 2023/01/14 01:30:53 manu Exp $
 
 In gcc>=10 SEL is implemented as an build-in typedef. Because it's
 required to use the typedef by gnustep-objc it's defined to overwrite
 it.
 
---- objc/runtime.h.orig        2015-08-07 11:33:41.000000000 +0000
-+++ objc/runtime.h
-@@ -68,6 +68,9 @@ typedef struct objc_ivar* Ivar;
+--- ./objc/runtime.h.orig      2020-08-23 15:10:20.000000000 +0000
++++ ./objc/runtime.h   2023-01-11 10:07:01.905661420 +0000
+@@ -68,8 +68,11 @@
+  */
  #if !defined(__clang__) && !defined(__OBJC_RUNTIME_INTERNAL__)
  typedef const struct objc_selector *SEL;
  #else
@@ -16,3 +17,4 @@ it.
  typedef struct objc_selector *SEL;
  #endif
  
+ /**

Index: pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc
diff -u pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc:1.2 pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc:1.3
--- pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc:1.2    Fri Apr 17 13:32:23 2020
+++ pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.cc        Sat Jan 14 01:30:53 2023
@@ -1,30 +1,69 @@
-$NetBSD: patch-objcxx_eh.cc,v 1.2 2020/04/17 13:32:23 joerg Exp $
+$NetBSD: patch-objcxx_eh.cc,v 1.3 2023/01/14 01:30:53 manu Exp $
 
 Workaround build failure due to redefinition and include correct header.
 
---- objcxx_eh.cc.orig  2015-08-07 11:33:41.000000000 +0000
-+++ objcxx_eh.cc
-@@ -3,6 +3,7 @@
+--- ./objcxx_eh.cc.orig        2020-08-23 15:10:20.000000000 +0000
++++ ./objcxx_eh.cc     2023-01-11 13:01:46.256573178 +0000
+@@ -5,8 +5,9 @@
  #include "dwarf_eh.h"
  #include "objcxx_eh.h"
- #include <exception>
+ #include "visibility.h"
+ #include "objc/runtime.h"
 +#include <typeinfo>
  
- extern "C" 
- {
-@@ -15,6 +16,7 @@ namespace __cxxabiv1
- 
- using __cxxabiv1::__class_type_info;
+ /**
+  * Helper function that has a custom personality function.
+  * This calls `cxx_throw` and has a destructor that must be run.  We intercept
+@@ -56,8 +57,9 @@
+        */
+       extern "C" __cxa_eh_globals *__cxa_get_globals();
+ }
  
 +#if 0
  namespace std
  {
-       /**
-@@ -48,6 +50,7 @@ namespace std
-                                               void **thrown_object) const;
+       struct type_info;
+ }
+@@ -99,8 +101,9 @@
+                               public:
+                               const char* name() const { return __type_name; }
        };
  }
 +#endif
  
- using namespace std;
+ namespace
+ {
+ /**
+@@ -190,9 +193,9 @@
+       // __cxa_exception takes a pointer to the end of the __cxa_exception
+       // structure, and so we find that by adding the size of the generic
+       // exception structure + padding to the pointer to the generic exception
+       // structure field of the enclosing structure.
+-      auto *cxxEx = pointer_add<__cxa_exception>(ex, exception_struct_size);
++      auto *cxxEx = pointer_add<__cxxabiv1::__cxa_exception>(ex, exception_struct_size);
+       __cxa_free_exception(cxxEx);
+ }
+ 
+ }
+@@ -262,9 +265,9 @@
+                        *
+                        * This should never be called on Objective-C types.
+                        */
+                       virtual bool __do_upcast(
+-                                      const __class_type_info *target,
++                                      const __cxxabiv1::__class_type_info *target,
+                                       void **thrown_object) const
+                       {
+                               return false;
+                       };
+@@ -374,9 +377,9 @@
+       _Unwind_Exception *ex = pointer_add<_Unwind_Exception>(newEx, -exception_struct_size);
+       *pointer_add<std::type_info*>(ex, type_info_offset) = &__objc_id_type_info;
+       ex->exception_class = cxx_exception_class;
+       ex->exception_cleanup = exception_cleanup;
+-      __cxa_get_globals()->uncaughtExceptions++;
++      __cxxabiv1::__cxa_get_globals()->uncaughtExceptions++;
+       return ex;
+ }
  
+ void* objc_object_for_cxx_exception(void *thrown_exception, int *isValid)
Index: pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h
diff -u pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h:1.2 pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h:1.3
--- pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h:1.2     Fri Apr 17 13:32:23 2020
+++ pkgsrc/devel/gnustep-objc/patches/patch-objcxx_eh.h Sat Jan 14 01:30:53 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-objcxx_eh.h,v 1.2 2020/04/17 13:32:23 joerg Exp $
+$NetBSD: patch-objcxx_eh.h,v 1.3 2023/01/14 01:30:53 manu Exp $
 
 Workaround build failure due to redefinition
 
---- objcxx_eh.h.orig   2015-08-07 11:33:41.000000000 +0000
-+++ objcxx_eh.h
-@@ -1,6 +1,11 @@
+--- ./objcxx_eh.h.orig 2020-08-23 15:10:20.000000000 +0000
++++ ./objcxx_eh.h      2023-01-11 10:07:02.311233320 +0000
+@@ -1,7 +1,12 @@
  #ifdef __cplusplus
  extern "C" {
  #endif
@@ -16,7 +16,9 @@ Workaround build failure due to redefini
  /**
   * Allocates a C++ exception.  This function is part of the Itanium C++ ABI and
   * is provided externally.
-@@ -25,7 +30,7 @@ __attribute__((weak)) DECLARE_PERSONALIT
+  */
+@@ -34,9 +39,9 @@
+  * Frees an exception object allocated by __cxa_allocate_exception().  Part of
   * the Itanium C++ ABI.
   */
  __attribute__((weak))
@@ -25,3 +27,4 @@ Workaround build failure due to redefini
  /**
   * Tests whether a C++ exception contains an Objective-C object, and returns if
   * if it does.  The second argument is a pointer to a boolean value indicating
+  * whether this is a valid object.

Index: pkgsrc/doc/CHANGES-2023
diff -u pkgsrc/doc/CHANGES-2023:1.326 pkgsrc/doc/CHANGES-2023:1.327
--- pkgsrc/doc/CHANGES-2023:1.326       Fri Jan 13 22:31:16 2023
+++ pkgsrc/doc/CHANGES-2023     Sat Jan 14 01:30:53 2023
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2023,v 1.326 2023/01/13 22:31:16 js Exp $
+$NetBSD: CHANGES-2023,v 1.327 2023/01/14 01:30:53 manu Exp $
 
 Changes to the packages collection and infrastructure in 2023:
 
@@ -387,3 +387,4 @@ Changes to the packages collection and i
        Updated sysutils/lf to 28 [bsiegert 2023-01-13]
        Updated devel/asdf to 0.11.1 [schmonz 2023-01-13]
        Updated chat/element-web to 1.11.17 [js 2023-01-13]
+       Updated devel/gnustep-objc to 2.1.0 [manu 2023-01-14]

Added files:

Index: pkgsrc/devel/gnustep-objc/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/devel/gnustep-objc/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sat Jan 14 01:30:53 2023
+++ pkgsrc/devel/gnustep-objc/patches/patch-CMakeLists.txt      Sat Jan 14 01:30:53 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2023/01/14 01:30:53 manu Exp $
+
+Remove useless ${CMAKE_CXX_FLAGS} that break the build
+
+--- CMakeLists.txt.orig        2023-01-12 14:46:28.472484641 +0000
++++ CMakeLists.txt     2023-01-12 14:46:55.625639141 +0000
+@@ -316,9 +316,9 @@
+                               set(ENABLE_OBJCXX false)
+                       endif()
+               endif ()
+               add_custom_command(OUTPUT eh_trampoline.s
+-                      COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_FLAGS} -fPIC -S "${CMAKE_SOURCE_DIR}/eh_trampoline.cc" -o - -fexceptions -fno-inline | sed 
"s/__gxx_personality_v0/test_eh_personality/g" > "${CMAKE_BINARY_DIR}/eh_trampoline.s"
++                      COMMAND ${CMAKE_CXX_COMPILER} -fPIC -S "${CMAKE_SOURCE_DIR}/eh_trampoline.cc" -o - -fexceptions -fno-inline | sed "s/__gxx_personality_v0/test_eh_personality/g" > 
"${CMAKE_BINARY_DIR}/eh_trampoline.s"
+                       MAIN_DEPENDENCY eh_trampoline.cc)
+               list(APPEND libobjc_ASM_SRCS eh_trampoline.s)
+               list(APPEND libobjc_CXX_SRCS objcxx_eh.cc)
+       endif ()