From nobody Sat Apr 06 13:54:04 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 4VBcK91D97z5Ggbr; Sat, 6 Apr 2024 13:54:05 +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 4VBcK90gYRz4gvc; Sat, 6 Apr 2024 13:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712411645; 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=1OTsb03iXj+50xaPUVe1BG6BS32+CFwmmeKT/L4A+RQ=; b=f+3skPJUY08wXzVfzfqlaXYLeMB+58khrPUlVnTNyXSHOXgWv4Zmc7hjDcZxWCN33EgukW 3Y0ZZRzid4EpD58eYAt2F1SRUhKAr/r9Rg7fkAvXz9oWB5+yTsllbadamivwZzJcCv/AU5 WfhnMhuq7DTV/ZNO4asE7yHstuEkb53Xyr960rXzpn+7095Z+YAEWqZrKXMS1UYeRht5V3 iiQhbss49CY1Scurt1vZ+nJ27HISfsxmjYV/CiofJydWKamGIy8Rtu0zYd6PKbLpWZ3tFj nC3yiy+Egbfu6NzHrJ1Eiwmhm4vrkFGABD7KJ1BFYp5Z2DTfzePG+WoOiiMuQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712411645; a=rsa-sha256; cv=none; b=x9YgjeVrS7shmNGIfMfn8T7UHwdA1Cqz9YQElVY/Js+BCCJ5P8lSq1Vw6qlvaHuA2cOMzh m889hv5eK5AzeljnRZzm/bMba78llifMqvwdDiGRTFE4yKtO0R/tjf42pRFgjdVdtP8mb8 HppSwwuHNr+vhyMm7bJDMLTdZqoIhlS3WMnsDNRHFqqrMvQkKgGRPNaQASTz3pjsqC8N9p XfbHgdHEL2sB4AOPUNfEtUqJAQ7rskQD2c0iocrHsNKScXFYzipIy8NpGYDbmqD0OeOkGu 9dJQ9IVprU5kRmBbJj7OIbQeoUk5bCqoLj2ZBwqpr4ZLlqRtaNNNGH5e5Oyrsw== 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=1712411645; 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=1OTsb03iXj+50xaPUVe1BG6BS32+CFwmmeKT/L4A+RQ=; b=yAt7rfa57cM8poZAOwU5Xl7/o+tXw6d3waZF3ivoARVr8BXfOcb5nEK8HPR95nbh4gZbm3 12bDY4u8TVGnrcCt3XBcM6tveKVY8GD2wxVGl8b/XDEJagnfqFOe2Rm6UL5qH45xwEn1NW sgomPpgCyfEcSy5rgpuULjp2WSjouB8RsAtAY/lEw1xLrdiOIl/0Jy5hNwUSJhdRhiLvpK pN5hHcDm5DW8axgcLii53PBtFqafjHTapckdLV/b0sGQhEyfcuCQhnVPfAbJJk9CkD8x68 qKhZT63LtLp9lf+O6cJkgtCleHfK4Dh2MPJEuy6rCJJgc/tFTI1hs6A5COhFLQ== 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 4VBcK90Gx9zmMX; Sat, 6 Apr 2024 13:54:05 +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 436Ds4jd084493; Sat, 6 Apr 2024 13:54:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436Ds4IU084490; Sat, 6 Apr 2024 13:54:04 GMT (envelope-from git) Date: Sat, 6 Apr 2024 13:54:04 GMT Message-Id: <202404061354.436Ds4IU084490@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 073a0a9e92f1 - main - math/libtommath: Fix previous commit 8509bb6 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 073a0a9e92f1f235c770c20f8e5c83bb893dcf9c Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=073a0a9e92f1f235c770c20f8e5c83bb893dcf9c commit 073a0a9e92f1f235c770c20f8e5c83bb893dcf9c Author: Daniel Engberg AuthorDate: 2024-04-06 13:38:10 +0000 Commit: Daniel Engberg CommitDate: 2024-04-06 13:53:34 +0000 math/libtommath: Fix previous commit 8509bb6 - Disable CCACHE detection - Sort menu options - Apply submitted patch with spelling fix and disable all vendor added FLAGS for CMAKE_BUILD_TYPE options Approved by: portmgr (blanket) --- math/libtommath/Makefile | 21 ++++++++------- math/libtommath/files/patch-CMakeLists.txt | 42 +++++++++++++++++++++++------- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/math/libtommath/Makefile b/math/libtommath/Makefile index fbe85a92e75d..15711072a63e 100644 --- a/math/libtommath/Makefile +++ b/math/libtommath/Makefile @@ -2,7 +2,7 @@ PORTNAME= libtommath DISTVERSION= 1.3.0 PORTREVISION= 2 CATEGORIES= math -MASTER_SITES= https://github.com/libtom/libtommath/releases/download/v${DISTVERSION}/ +MASTER_SITES= https://github.com/libtom/${PORTNAME}/releases/download/v${DISTVERSION}/ DISTNAME= ltm-${DISTVERSION} MAINTAINER= gahr@FreeBSD.org @@ -13,16 +13,19 @@ LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:testing tar:xz +USE_LDCONFIG= yes -OPTIONS_DEFINE= OPTIMIZED_CFLAGS LTO -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 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -USE_LDCONFIG= yes +CMAKE_ON= BUILD_SHARED_LIBS +# Remove this in next release and use USES= pathfix instead +CMAKE_ARGS= -DCMAKE_INSTALL_PKGCONFIGDIR:STRING=libdata/pkgconfig + +OPTIONS_DEFINE= LTO OPTIMIZED_CFLAGS +OPTIONS_DEFAULT= LTO OPTIMIZED_CFLAGS + +LTO_CMAKE_BOOL= COMPILE_LTO + +OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops -fomit-frame-pointer .include diff --git a/math/libtommath/files/patch-CMakeLists.txt b/math/libtommath/files/patch-CMakeLists.txt index 5a6bef8dcf3a..d4514a1a4e68 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,17 +49,17 @@ 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,15 @@ endif() # What compiler do we have and what are their...uhm... peculiarities -@@ -103,6 +98,7 @@ add_library(${PROJECT_NAME} + if(CMAKE_C_COMPILER_ID MATCHES "(C|c?)lang") + list(APPEND LTM_C_FLAGS -Wno-typedef-redefinition -Wno-tautological-compare -Wno-builtin-requires-header) + # Clang requires at least '-O1' for dead code elimination +- set(CMAKE_C_FLAGS_DEBUG "-O1 ${CMAKE_C_FLAGS_DEBUG}") ++# set(CMAKE_C_FLAGS_DEBUG "-O1 ${CMAKE_C_FLAGS_DEBUG}") + endif() + if(CMAKE_C_COMPILER MATCHES "mingw") + list(APPEND LTM_C_FLAGS -Wno-shadow -Wno-expansion-to-defined -Wno-declaration-after-statement -Wno-bad-function-cast) +@@ -103,6 +84,7 @@ add_library(${PROJECT_NAME} # library target #----------------------------------------------------------------------------- add_library(${PROJECT_NAME} @@ -35,7 +57,7 @@ ${SOURCES} ${HEADERS} ) -@@ -125,12 +121,23 @@ endif() +@@ -125,12 +107,23 @@ endif() list(APPEND PUBLIC_HEADERS tommath_c89.h) endif() @@ -59,7 +81,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 +90,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 +121,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 +142,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)