From nobody Sun Apr 7 07:53:56 2024 X-Original-To: dev-commits-ports-all@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 4VC4H86l8Jz5GV0x; Sun, 7 Apr 2024 07:53:56 +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 4VC4H86Hvcz4bdT; Sun, 7 Apr 2024 07:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712476436; 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=BqKXTmh9JV70g+RDmpsh7C3GiCiC6Q8x814R7/02ON4=; b=rETA8+Ygy8zk8VBiX/DNYNH0nb528IlijveD0+5Wq3eJhpFnFrdF7KaIwSWIkaDDddYt48 1gose8D8nRM3klTuZHk+tVTVhParr357DdJz1qJ49etl27jVyHGGX9J38NdTGq18lqhWY/ 0tAwjCWnJtg/TfR4ol3AgO4+NFF9Shpy0zzBgMry8lCeIJcI9wDBf04l51t97ryBi85yjb 15YH0qwkNpf+x13O146y5ETvb4FT+0xRTH6pGmJROmuh4r9f5jJcnvNydTPNXVVitA0upO 8Y3QQLkABbdLf19bemHFf1kV+csW5bVHsviI9+jOqIEAa1+bWJqsldTBhrUxWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712476436; a=rsa-sha256; cv=none; b=pJFnFmqffUtH16QirzuhfDIg7DtUM7cOUDm/xfIgLCYDO98C2VpnW5e5EqCHM2036IRb/w mvn9por71vWv22xI8O+syQupG2OM+s9uXLaXutdKvG+UxenOgtVOtdbIFD/9PRYA0frdN4 E7dnAiRHt8uJVSMwBj35RRbSa9FxD3erlMxEF14TY7MQK5tVyz8qIBZiXCvttZsEUbxOis 93YSKhLcmgfurm0z3dWn3wlUemqqO/EcfQMtNDn9a1kC0rHHl8u1zMOOXo4sSXDT1/cvK4 ocJ1kUnADVe40mo7a5IquSlQztH1zIxmX9op/Bu9ygTJ+DPnNrZ7MFo3asyPvw== 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=1712476436; 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=BqKXTmh9JV70g+RDmpsh7C3GiCiC6Q8x814R7/02ON4=; b=VkcqPpUEBOxl1Qz5VCbLbCUd3arheckwFPL+IbMmK+4FUtSVw64q1cyMk++gMut08ynpSL SaKExOQpPxnTaQCCtDD730JKZr6wv2axe5ZFqBBVwAUhW9EcV3i0kY91IG8DDwku2YDjtx g4oeIQf+xrL05wGVFDdIBBdzO4TXYJ75cR017fea1uDE3iC+KhG2J2Wv5NdPYBzUR2XtKm pyD2tWI8ScFq39sz5nh4nrcVMaW0J2kykqox+Om1Uix/c4SLgzl1dRzFQntx+/6OoSLi6m RNZYFiXnCTPv0CKvylsyYcHuByqxQZYLAyJoRWK2r/wfhKxK+sdCKWTd5hzJjw== 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 4VC4H85w3CzK9W; Sun, 7 Apr 2024 07:53:56 +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 4377rumR012187; Sun, 7 Apr 2024 07:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4377ruqD012184; Sun, 7 Apr 2024 07:53:56 GMT (envelope-from git) Date: Sun, 7 Apr 2024 07:53:56 GMT Message-Id: <202404070753.4377ruqD012184@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: c2466b565816 - main - math/libtommath: small improvements List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2466b565816996cde963b4b3203bf9f933b0f66 Auto-Submitted: auto-generated The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2466b565816996cde963b4b3203bf9f933b0f66 commit c2466b565816996cde963b4b3203bf9f933b0f66 Author: Pietro Cerutti AuthorDate: 2024-04-07 07:47:48 +0000 Commit: Pietro Cerutti CommitDate: 2024-04-07 07:53:53 +0000 math/libtommath: small improvements * remove built-in ccache detection (missing in my previous commit) * remove superfluous -DBUILD_TESTING:BOOL=ON in CMAKE_ARGS Suggested by: diizzy --- math/libtommath/Makefile | 3 +-- math/libtommath/files/patch-CMakeLists.txt | 34 +++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/math/libtommath/Makefile b/math/libtommath/Makefile index fbe85a92e75d..f38e842c40b4 100644 --- a/math/libtommath/Makefile +++ b/math/libtommath/Makefile @@ -19,8 +19,7 @@ OPTIONS_DEFAULT=OPTIMIZED_CFLAGS LTO OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops -fomit-frame-pointer LTO_CMAKE_BOOL= COMPILE_LTO -CMAKE_ARGS= -DBUILD_TESTING:BOOL=ON \ - -DCMAKE_INSTALL_PKGCONFIGDIR:STRING=libdata/pkgconfig +CMAKE_ARGS= -DCMAKE_INSTALL_PKGCONFIGDIR:STRING=libdata/pkgconfig WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} USE_LDCONFIG= yes diff --git a/math/libtommath/files/patch-CMakeLists.txt b/math/libtommath/files/patch-CMakeLists.txt index 5a6bef8dcf3a..57a5b0a01caa 100644 --- a/math/libtommath/files/patch-CMakeLists.txt +++ b/math/libtommath/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ --- CMakeLists.txt.orig 2024-03-27 13:30:15 UTC +++ CMakeLists.txt -@@ -29,11 +29,6 @@ include(sources.cmake) +@@ -29,25 +29,6 @@ include(sources.cmake) include(sources.cmake) #----------------------------------------------------------------------------- @@ -9,10 +9,24 @@ -option(BUILD_SHARED_LIBS "Build shared library and only the shared library if \"ON\", default is static" OFF) - -#----------------------------------------------------------------------------- - # Add support for ccache if desired +-# Add support for ccache if desired +-#----------------------------------------------------------------------------- +-find_program(CCACHE ccache) +- +-if(CCACHE) +- option(ENABLE_CCACHE "Enable ccache." ON) +-endif() +- +-# use ccache if installed +-if(CCACHE AND ENABLE_CCACHE) +- set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE}) +-endif() +- +-#----------------------------------------------------------------------------- + # Compose CFLAGS #----------------------------------------------------------------------------- - find_program(CCACHE ccache) -@@ -68,10 +63,10 @@ else() + +@@ -68,10 +49,10 @@ else() set(LTM_C_FLAGS -Wall -Wsign-compare -Wextra -Wshadow -Wdeclaration-after-statement -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wpointer-arith -Wsystem-headers) @@ -27,7 +41,7 @@ endif() # What compiler do we have and what are their...uhm... peculiarities -@@ -103,6 +98,7 @@ add_library(${PROJECT_NAME} +@@ -103,6 +84,7 @@ add_library(${PROJECT_NAME} # library target #----------------------------------------------------------------------------- add_library(${PROJECT_NAME} @@ -35,7 +49,7 @@ ${SOURCES} ${HEADERS} ) -@@ -125,12 +121,23 @@ endif() +@@ -125,12 +107,23 @@ endif() list(APPEND PUBLIC_HEADERS tommath_c89.h) endif() @@ -59,7 +73,7 @@ option(COMPILE_LTO "Build with LTO enabled") if(COMPILE_LTO) -@@ -159,7 +166,7 @@ set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") +@@ -159,7 +152,7 @@ set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") set(PROJECT_CONFIG_FILE "${PROJECT_NAME}-config.cmake") set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") @@ -68,7 +82,7 @@ EXPORT ${TARGETS_EXPORT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -@@ -168,20 +175,18 @@ install(TARGETS ${PROJECT_NAME} +@@ -168,20 +161,18 @@ install(TARGETS ${PROJECT_NAME} ) # Install libtommath.pc for pkg-config if we build a shared library @@ -99,7 +113,7 @@ # generate package version file write_basic_package_version_file( -@@ -262,18 +267,11 @@ endif() +@@ -262,18 +253,11 @@ endif() list(APPEND CPACK_GENERATOR FREEBSD) endif() @@ -120,7 +134,7 @@ set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LibTomMath") set(CPACK_PACKAGE_VENDOR "libtom projects") -@@ -287,15 +285,7 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) +@@ -287,15 +271,7 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_DEBUGINFO_PACKAGE ON) set(CPACK_DEBIAN_PACKAGE_RELEASE ${PACKAGE_RELEASE_VERSION}) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)