Date: Wed, 26 Aug 2020 21:41:46 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546301 - in head/lang/libobjc2: . files Message-ID: <202008262141.07QLfkwL091106@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Wed Aug 26 21:41:45 2020 New Revision: 546301 URL: https://svnweb.freebsd.org/changeset/ports/546301 Log: lang/libobjc2: Fix linking against Pull in a patch from upstream to fix generation of eh_trampoline(). Without this patch linking against libobjc sometimes failes with undefined reference to `eh_trampoline()'. Build tests by default. MFH: 2020Q3 X-MFH-With: 546146 Added: head/lang/libobjc2/files/ head/lang/libobjc2/files/patch-f64803db.c (contents, props changed) Modified: head/lang/libobjc2/Makefile Modified: head/lang/libobjc2/Makefile ============================================================================== --- head/lang/libobjc2/Makefile Wed Aug 26 21:03:26 2020 (r546300) +++ head/lang/libobjc2/Makefile Wed Aug 26 21:41:45 2020 (r546301) @@ -4,7 +4,7 @@ PORTNAME= libobjc2 DISTVERSIONPREFIX=v DISTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang devel gnustep MAINTAINER= ports@FreeBSD.org @@ -22,7 +22,6 @@ GH_TUPLE= Tessil:robin-map:757de82:robin_map/third_par USE_LDCONFIG= yes CMAKE_ARGS+= -DLIB_INSTALL_PATH=lib -CMAKE_ARGS+= -DTESTS=OFF LDFLAGS_armv7= -Wl,-znotext SSP_UNSAFE= yes Added: head/lang/libobjc2/files/patch-f64803db.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/libobjc2/files/patch-f64803db.c Wed Aug 26 21:41:45 2020 (r546301) @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e2746e9..80b7dfe 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -317,7 +317,7 @@ if (ENABLE_OBJCXX) + 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008262141.07QLfkwL091106>