From nobody Sat Jun 01 11:55:21 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vrz2K48F0z5MmRC; Sat, 01 Jun 2024 11:55:21 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vrz2K3KPvz410V; Sat, 1 Jun 2024 11:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717242921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XCrlZlyVDQ9+/s8IcfsMWTuVg4xP2rwdzKVTQ/lQnqQ=; b=r4GGKASWqgbak0mw/6PL0J5J0XF1uKnJ+4HeO5qdPnNirLLARrmN9YsmXzGOpxvM/Lsc/C udQmN+bFpN1uxrPcsV6Ho/5k5ymiSZdNtj0Rq9lW4haJW2QDYs/rREzP8TpmgEVJnMC7Ue v/vk1ICd+cRzB5afPXO82yoJMkssJiSGUcj48GXHYZo2Vm7iP7nuVCUMMDXppFjgZkJJRT cDFGkP5FE+kzLGeouXIMyGrYo8TCgRRFXCXSdB39bPYc8Ej7i5onZdnJ/ym0aGp036wwIL iWjAaZ7+6jgOMxRYeWyPGXhzL4JihGAWmk30Ua8muI6OSRc1KWoDfdMs9IlaDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717242921; a=rsa-sha256; cv=none; b=qRbpwpbhZsQBdK0eT1UlIxFkurdsip+jyPNZASoLDNQru5HzNRYM6P/W80u2qsQxuuV7Zh SwKfd5B9AZ4kMZTgvsEi/GUqNOsec7SpeBpAJmiG5F8M8laADzjCQvKXvUts3M/SSTp3A7 /tViqYTpvLhk+o0VJ7Tg/WtZmZfrOLdES8rgRDTY8XUDtrrquChE6/eFi3oBaJjIWcdXPg lv+mTKReuksfZBQY8vZe/YJh5w0drmW6izWgp1gWKEUDlOtLmjzI1LV4O3jxQ5q/veQg5g cWFXcx7Mx/cXu/JrrW741TYysibhuX/O6QahcqPW19Kb1Cnmn1C/PWBPAtGYWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717242921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XCrlZlyVDQ9+/s8IcfsMWTuVg4xP2rwdzKVTQ/lQnqQ=; b=KJgc16K4p6x/VuluhE+hraWA7aljQGZcljhTf++dQAzSpdpvtFxPh7ATHKk1jOXzdstZoL gquwKcJAL8C7alGevLScTpmGj+rj65R/z1lohcCLL13Wjzamsi2uNk3s83vp53Aif/akwT PfxqpLuogC50HALF7HT4Zn8edSNOtOTDm3dCMxPziBp828Yfg0CTa7L7DWmZE/5tLJcfov 1y3+kfpqHid34psyq7apZyecipHX/xWAdpp/+uZ8z59dNzcbqTDJ3keb9EKmoYFPbdp09Z mBRwISRVV9SW6GXrQQjBiLhxF0DIKbEc8iaKaZcEOEXwqgRZvah0hjYCAhZAOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vrz2K2vVTz16L0; Sat, 1 Jun 2024 11:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 451BtLDo024546; Sat, 1 Jun 2024 11:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451BtLDt024543; Sat, 1 Jun 2024 11:55:21 GMT (envelope-from git) Date: Sat, 1 Jun 2024 11:55:21 GMT Message-Id: <202406011155.451BtLDt024543@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: ffc2bc893a34 - main - lang/libobjc2: update to 2.2.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffc2bc893a3424e71670146e1407ff523fc01c37 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=ffc2bc893a3424e71670146e1407ff523fc01c37 commit ffc2bc893a3424e71670146e1407ff523fc01c37 Author: Fernando Apesteguía AuthorDate: 2024-05-31 17:52:06 +0000 Commit: Fernando Apesteguía CommitDate: 2024-06-01 11:54:46 +0000 lang/libobjc2: update to 2.2.1 While here use robin-map from ports instead of the submodule. --- lang/libobjc2/Makefile | 9 +++---- lang/libobjc2/distinfo | 8 +++---- lang/libobjc2/files/patch-CMakeLists.txt | 41 ++++++++++++++++++++++++++++++++ lang/libobjc2/files/patch-f64803db.c | 13 ---------- lang/libobjc2/pkg-plist | 7 +++--- 5 files changed, 53 insertions(+), 25 deletions(-) diff --git a/lang/libobjc2/Makefile b/lang/libobjc2/Makefile index 9b96bd35ad43..42ba110e942d 100644 --- a/lang/libobjc2/Makefile +++ b/lang/libobjc2/Makefile @@ -1,7 +1,6 @@ PORTNAME= libobjc2 DISTVERSIONPREFIX=v -DISTVERSION= 2.1 -PORTREVISION= 3 +DISTVERSION= 2.2.1 CATEGORIES= lang devel gnustep MAINTAINER= ports@FreeBSD.org @@ -9,11 +8,12 @@ COMMENT= Replacement Objective-C runtime supporting modern Objective-C features LICENSE= MIT +BUILD_DEPENDS= ${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map + USES= cmake compiler objc:compiler USE_GITHUB= yes GH_ACCOUNT= gnustep -GH_TUPLE= Tessil:robin-map:757de82:robin_map/third_party/robin-map USE_LDCONFIG= yes @@ -21,7 +21,8 @@ LDFLAGS+= -lm TEST_TARGET= test -CMAKE_ARGS+= -DLIB_INSTALL_PATH=lib +CMAKE_ARGS+= -DLIB_INSTALL_PATH=lib \ + -DLOCALBASE=${LOCALBASE} LDFLAGS_armv7= -Wl,-znotext SSP_UNSAFE= yes diff --git a/lang/libobjc2/distinfo b/lang/libobjc2/distinfo index efcf8e61593a..9b8b43d151de 100644 --- a/lang/libobjc2/distinfo +++ b/lang/libobjc2/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1598301863 -SHA256 (gnustep-libobjc2-v2.1_GH0.tar.gz) = 78fc3711db14bf863040ae98f7bdca08f41623ebeaf7efaea7dd49a38b5f054c -SIZE (gnustep-libobjc2-v2.1_GH0.tar.gz) = 200290 -SHA256 (Tessil-robin-map-757de82_GH0.tar.gz) = b365d847a23ce48a4e5c76c4a8194693f18323bf7cacdc0f57ada92ee275bd45 -SIZE (Tessil-robin-map-757de82_GH0.tar.gz) = 63288 +TIMESTAMP = 1717156055 +SHA256 (gnustep-libobjc2-v2.2.1_GH0.tar.gz) = 768ea8c5bd0999a29b5d15781125494f986456c1dc5c51d370fb31852cd31ea1 +SIZE (gnustep-libobjc2-v2.2.1_GH0.tar.gz) = 205087 diff --git a/lang/libobjc2/files/patch-CMakeLists.txt b/lang/libobjc2/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..ad0d5232999b --- /dev/null +++ b/lang/libobjc2/files/patch-CMakeLists.txt @@ -0,0 +1,41 @@ +--- CMakeLists.txt.orig 2024-03-21 16:06:36 UTC ++++ CMakeLists.txt +@@ -29,9 +29,10 @@ INCLUDE (FetchContent) + INCLUDE (CheckCXXSourceCompiles) + INCLUDE (FetchContent) + ++include_directories(${LOCALBASE}/include) ++ + set(libobjc_VERSION 4.6) + +- + if (MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /EHas") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHas") +@@ -128,17 +129,6 @@ endif () + list(APPEND libobjc_C_SRCS eh_personality.c) + endif () + +-find_package(tsl-robin-map) +- +-if (NOT tsl-robin-map_FOUND) +- FetchContent_Declare( +- robinmap +- GIT_REPOSITORY https://github.com/Tessil/robin-map/ +- GIT_TAG v1.2.1) +- +- FetchContent_MakeAvailable(robinmap) +-endif() +- + if (WIN32) + set(OLD_ABI_COMPAT_DEFAULT false) + else() +@@ -255,8 +245,6 @@ endif() + if (WIN32 AND NOT MINGW) + target_link_libraries(objc ntdll.dll) + endif() +- +-target_link_libraries(objc tsl::robin_map) + + set_target_properties(objc PROPERTIES + LINKER_LANGUAGE C diff --git a/lang/libobjc2/files/patch-f64803db.c b/lang/libobjc2/files/patch-f64803db.c deleted file mode 100644 index 9904727b356c..000000000000 --- a/lang/libobjc2/files/patch-f64803db.c +++ /dev/null @@ -1,13 +0,0 @@ -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) diff --git a/lang/libobjc2/pkg-plist b/lang/libobjc2/pkg-plist index 38594cd36620..01d049d3c663 100644 --- a/lang/libobjc2/pkg-plist +++ b/lang/libobjc2/pkg-plist @@ -1,3 +1,5 @@ +include/Block.h +include/Block_private.h include/objc/Availability.h include/objc/Object.h include/objc/Protocol.h @@ -12,14 +14,13 @@ include/objc/objc-api.h include/objc/objc-arc.h include/objc/objc-auto.h include/objc/objc-class.h +include/objc/objc-exception.h include/objc/objc-runtime.h include/objc/objc-visibility.h include/objc/objc.h -include/objc/runtime.h include/objc/runtime-deprecated.h +include/objc/runtime.h include/objc/slot.h -include/Block.h -include/Block_private.h lib/libobjc.so lib/libobjc.so.%%SHLIB_MAJOR%% lib/libobjc.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%