From nobody Thu Apr 04 04:05:29 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 4V97Lx2c34z5G65g; Thu, 4 Apr 2024 04:05:29 +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 4V97Lx23l6z4CWD; Thu, 4 Apr 2024 04:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712203529; 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=kv0T+MdIj9JcmwzuLmLJWEyOBpPUZe2RcJh3FBju/Ns=; b=lZYO87DhBAuw0Wmz5UMGmxZHKE1CGHY891FQVS4dVM6EQCow2GYCH7YBwRs6epcNHRxmd7 5Umc5J5fyBgQX+46xviIO4ZpqWvMG6dmCmjhNNU4aiNXfn56IV5jGAWYEFwKCWfF+EU0Bb DC3teZSQST9/WyJ8W3QwlUem9J8aUUaAcR0EfTVbbzM5LNWV+M8cv7HrWqIMQeqT5S8Sk0 KaiUF5cczVsn5blEE9x3S1rhjGx5NV/+1/Jj60NhXHChGR3XCnyiOJovBltxOVx1ND2VfK oscFnYXpjZeM8/5TTmr9iQircjuU0a4sCnYwaXK61BRj+cPquTT3XR4SPieflg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712203529; a=rsa-sha256; cv=none; b=d2e4REyFND3drIrfKNltVKlE46qrHZZBd5Mff98XEOciuNYnV2bbvAe2i21HvPL+czl8em cpKKm27tjf8gabK+lELJCYCol33gBsGXaUhjFV1IY83GuYPSanpCL5iwcPI+JH6BgoKojF OBBMM0r498Vkj71NpRYjSVlglicm3GfPWm798GcbUegl2RsbDp2N7A16O5uQnSWZsAmf8f NvgdBBfYVHY+4CFkSMVQy/c4/3KRhfItU8oFvywjxhHagI5sd0AfqvyLJZvsFm3EEuJpIQ LUZ3hR//MhPc+8xFmRDpa7UtDbO+NYoJlYyghWkkvnJ6rueP4r7S+2Fd+OqICQ== 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=1712203529; 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=kv0T+MdIj9JcmwzuLmLJWEyOBpPUZe2RcJh3FBju/Ns=; b=iSwdqFPStQXmtr7I4QJ0qRKjgkvSAItReWDqKrzsFvXWYi3xDuPxZzdygbptmmXs8sue05 toMGcSu79sBvRMxqhYsmZNsnTOuGS5K6670rVscLY+PciuUaGq4iMtdDtCVgV0MCDfetEe Wa3255jeOhRluh2sJ+QJXi/Ie2pZ2f6v7XIy2BWpJZ6jtJQVHFi+bs2GsiCVsQzfkNkN76 2o66p+7DyGYHtMXuDjV0mdVYnR2aReCbb+QD5r+4aO2FVyM6IHAXDdIEVjq569kDl22iDH THn/4obAtzB0r1cv0DfvYlHNOrdNrVxAcdGo9mphGyUvBIsSISfyNUm8Led/yg== 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 4V97Lx1ZQdz11NX; Thu, 4 Apr 2024 04:05:29 +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 43445T2O098541; Thu, 4 Apr 2024 04:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43445T6h098538; Thu, 4 Apr 2024 04:05:29 GMT (envelope-from git) Date: Thu, 4 Apr 2024 04:05:29 GMT Message-Id: <202404040405.43445T6h098538@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: edab87269924 - main - math/libtommath: add missing patch 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: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edab8726992480217bcef72d40947150d6932690 Auto-Submitted: auto-generated The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=edab8726992480217bcef72d40947150d6932690 commit edab8726992480217bcef72d40947150d6932690 Author: Pietro Cerutti AuthorDate: 2024-04-04 04:04:16 +0000 Commit: Pietro Cerutti CommitDate: 2024-04-04 04:05:26 +0000 math/libtommath: add missing patch --- math/libtommath/files/patch-CMakeLists.txt | 124 +++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/math/libtommath/files/patch-CMakeLists.txt b/math/libtommath/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..fe22d8758e0f --- /dev/null +++ b/math/libtommath/files/patch-CMakeLists.txt @@ -0,0 +1,124 @@ +--- CMakeLists.txt.orig 2024-03-27 13:30:15 UTC ++++ CMakeLists.txt +@@ -29,11 +29,6 @@ include(sources.cmake) + include(sources.cmake) + + #----------------------------------------------------------------------------- +-# Options +-#----------------------------------------------------------------------------- +-option(BUILD_SHARED_LIBS "Build shared library and only the shared library if \"ON\", default is static" OFF) +- +-#----------------------------------------------------------------------------- + # Add support for ccache if desired + #----------------------------------------------------------------------------- + find_program(CCACHE ccache) +@@ -103,6 +98,7 @@ add_library(${PROJECT_NAME} + # library target + #----------------------------------------------------------------------------- + add_library(${PROJECT_NAME} ++ OBJECT + ${SOURCES} + ${HEADERS} + ) +@@ -125,12 +121,23 @@ endif() + list(APPEND PUBLIC_HEADERS tommath_c89.h) + endif() + ++add_library(${PROJECT_NAME}_shared SHARED $) ++add_library(${PROJECT_NAME}_static STATIC $) + set_target_properties(${PROJECT_NAME} PROPERTIES ++ POSITION_INDEPENDENT_CODE TRUE ++) ++set_target_properties(${PROJECT_NAME}_shared PROPERTIES + OUTPUT_NAME tommath + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR} + PUBLIC_HEADER "${PUBLIC_HEADERS}" + ) ++set_target_properties(${PROJECT_NAME}_static PROPERTIES ++ OUTPUT_NAME tommath ++ VERSION ${PROJECT_VERSION} ++ SOVERSION ${PROJECT_VERSION_MAJOR} ++ PUBLIC_HEADER "${PUBLIC_HEADERS}" ++) + + option(COMPILE_LTO "Build with LTO enabled") + if(COMPILE_LTO) +@@ -159,7 +166,7 @@ set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") + set(PROJECT_CONFIG_FILE "${PROJECT_NAME}-config.cmake") + set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") + +-install(TARGETS ${PROJECT_NAME} ++install(TARGETS ${PROJECT_NAME}_shared ${PROJECT_NAME}_static + EXPORT ${TARGETS_EXPORT_NAME} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries +@@ -168,20 +175,18 @@ install(TARGETS ${PROJECT_NAME} + ) + + # Install libtommath.pc for pkg-config if we build a shared library +-if(BUILD_SHARED_LIBS) +- # Let the user override the default directory of the pkg-config file (usually this shouldn't be required to be changed) +- set(CMAKE_INSTALL_PKGCONFIGDIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "Folder where to install .pc files") ++# Let the user override the default directory of the pkg-config file (usually this shouldn't be required to be changed) ++set(CMAKE_INSTALL_PKGCONFIGDIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "Folder where to install .pc files") + +- configure_file( +- ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in +- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc +- @ONLY +- ) ++configure_file( ++ ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in ++ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc ++ @ONLY ++) + +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc +- DESTINATION ${CMAKE_INSTALL_PKGCONFIGDIR} +- ) +-endif() ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc ++ DESTINATION ${CMAKE_INSTALL_PKGCONFIGDIR} ++) + + # generate package version file + write_basic_package_version_file( +@@ -262,18 +267,11 @@ endif() + list(APPEND CPACK_GENERATOR FREEBSD) + endif() + +-set(LTM_DEBIAN_SHARED_PACKAGE_NAME "${PROJECT_NAME}${PACKAGE_NAME_SUFFIX}${PROJECT_VERSION_MAJOR}") +- + # general CPack config + set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR}/packages/${DISTRO_PACK_PATH}) + message(STATUS "CPack: packages will be generated under ${CPACK_PACKAGE_DIRECTORY}") +-if(BUILD_SHARED_LIBS) +- set(CPACK_PACKAGE_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}") +- set(CPACK_DEBIAN_PACKAGE_NAME "${LTM_DEBIAN_SHARED_PACKAGE_NAME}") +-else() +- set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-devel") +- set(CPACK_DEBIAN_LIBRARIES_PACKAGE_NAME "${PROJECT_NAME}${PACKAGE_NAME_SUFFIX}-dev") +-endif() ++set(CPACK_PACKAGE_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}") ++set(CPACK_DEBIAN_PACKAGE_NAME "${PROJECT_NAME}${PACKAGE_NAME_SUFFIX}${PROJECT_VERSION_MAJOR}") + 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) + set(CPACK_DEBIAN_DEBUGINFO_PACKAGE ON) + set(CPACK_DEBIAN_PACKAGE_RELEASE ${PACKAGE_RELEASE_VERSION}) + set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) +-if(BUILD_SHARED_LIBS) +- set(CPACK_DEBIAN_PACKAGE_SECTION "libs") +-else() +- set(CPACK_DEBIAN_PACKAGE_SECTION "devel") +- set(CPACK_DEBIAN_PACKAGE_DEPENDS ${LTM_DEBIAN_SHARED_PACKAGE_NAME}) +- set(CPACK_DEB_COMPONENT_INSTALL ON) +- set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) +- set(CPACK_COMPONENTS_ALL Libraries) +-endif() ++set(CPACK_DEBIAN_PACKAGE_SECTION "libs") + + # rpm specific CPack config + set(CPACK_RPM_PACKAGE_RELEASE ${PACKAGE_RELEASE_VERSION})