From owner-svn-ports-all@freebsd.org Wed Aug 26 21:41:46 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C66913BDC3A; Wed, 26 Aug 2020 21:41:46 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BcK7Z4mpqz3TTj; Wed, 26 Aug 2020 21:41:46 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8705F195F4; Wed, 26 Aug 2020 21:41:46 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07QLfkIb091108; Wed, 26 Aug 2020 21:41:46 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07QLfkwL091106; Wed, 26 Aug 2020 21:41:46 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202008262141.07QLfkwL091106@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 26 Aug 2020 21:41:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546301 - in head/lang/libobjc2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/lang/libobjc2: . files X-SVN-Commit-Revision: 546301 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Aug 2020 21:41:46 -0000 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)