From nobody Wed Oct 23 19:33:46 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 4XYfNp1kcZz5ZbWX; Wed, 23 Oct 2024 19:33:46 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYfNp1BqJz4LCX; Wed, 23 Oct 2024 19:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729712026; 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=d8VOP9dxZR40yt3Vop3Iaem8wPW573r4AVee13yf7AA=; b=wpnBie811Pd+dxRnp9A4oq3UoP7BvdMRfX0dkUXONRl0pP8LesdgfbXhFDm9lUopZzXuKP w9pFh200oreaF1fy/G23VUeJ/+TdWcri/KQYLIEyX6YQeTAeRKizuySEyBCu9HDixQN/l8 /3r2/cpm2Z+jAHN+2+i6MdZOR83Z4QpgzWr57kqwmfquKRFb7UJWmjEEzdfWDA4+lJ4oP5 1RJICasqdMWzEHmVd+CNX4lpnz71CHQRs8/BSX+dhx+X4ubp/pozBy69/BDsyoY+NzU64r fJSzj7mXgHyvD3VTjTalmh19Q5fXAWFU3pQBAOPxdNMkVO8R6pWYZj5jdG9piw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729712026; 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=d8VOP9dxZR40yt3Vop3Iaem8wPW573r4AVee13yf7AA=; b=oJwg4JdKRxtzXxOs84Gr51h0CGAnb9oQBxQbBIt8wPOGRfZCnsp8ssB1yO9BBIIOYvHkCg 9Oc0VWSTNgbL/c9QAdbASkTAb8xGgDKqTmzdTfxNPkdil8TFoF+lTfNyIcFYigarlROxvg HOcPZuJBOSA+X9FhxErxyGPzp0HvJqRwvS5S7TPKhs24jLH95aCgQoK0kJRzf18HJ7j0A5 1uGhtSs7ZdU1k8Uz0/YuPqH8j7Obm0iHxbqbh5gBmcH/VkmSXy9XoKrlM1fmgWqyOMrp2D 0TQ6yWKI7IOSh7OYe+BHGSpWflmx+1o2yYuIREM5LgvTv4ISyqzyUQlM3+5QBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729712026; a=rsa-sha256; cv=none; b=ySPp0lO5yuVFdvSsFMsbifKRmj68zXAcOWVwSy0/bDREqqOOZtYi34JspvA7bCihqlkGa/ mMQEZIG+if294jTVi9DJKwDqrvQMlIDX20L3kJSWJ+e2o+0osbQKJ9k/xjl7b+duRwBQpC tS7HY4CaCWUUDC1ugR9y2kKMUrt4mUays80KlNKYjao56Iv3KczMxtrAd/W+hZDL9lNcrL Zdh9n/OvgC99GyUxBaFBTRabPYrNDCV3wiGyNSX+xhwjTI9nCAd4ObSHzI8aeyYU3fHM7j u0cO+fBhr9H4cwRhEdnf4qeDG6kuLElZ9xzPniwqG52BOvt6bnTSKll9fREVPg== 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 4XYfNp0p1Nz1B4g; Wed, 23 Oct 2024 19:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NJXkRH089574; Wed, 23 Oct 2024 19:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NJXkT3089571; Wed, 23 Oct 2024 19:33:46 GMT (envelope-from git) Date: Wed, 23 Oct 2024 19:33:46 GMT Message-Id: <202410231933.49NJXkT3089571@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: 927d3fd388c9 - main - graphics/tiff: Replace local patch with upstreamed 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: 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 927d3fd388c92746cf46d6995bd8a974ada7ca9d Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=927d3fd388c92746cf46d6995bd8a974ada7ca9d commit 927d3fd388c92746cf46d6995bd8a974ada7ca9d Author: Daniel Engberg AuthorDate: 2024-10-23 18:39:41 +0000 Commit: Daniel Engberg CommitDate: 2024-10-23 19:33:37 +0000 graphics/tiff: Replace local patch with upstreamed patch Reference: https://gitlab.com/libtiff/libtiff/-/commit/0dbcfc5bd2eaacf8be4f57f8b7cc7369d88fafa8 Approved by: portmgr (blanket) --- graphics/tiff/files/patch-cmake_LinkerChecks.cmake | 11 ----- ...git-01-0dbcfc5bd2eaacf8be4f57f8b7cc7369d88fafa8 | 52 ++++++++++++++++++++++ graphics/tiff/files/patch-libtiff_CMakeLists.txt | 11 ----- 3 files changed, 52 insertions(+), 22 deletions(-) diff --git a/graphics/tiff/files/patch-cmake_LinkerChecks.cmake b/graphics/tiff/files/patch-cmake_LinkerChecks.cmake deleted file mode 100644 index 8b6c8c54482f..000000000000 --- a/graphics/tiff/files/patch-cmake_LinkerChecks.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/LinkerChecks.cmake.orig 2024-09-21 09:08:00 UTC -+++ cmake/LinkerChecks.cmake -@@ -39,7 +39,7 @@ set(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS}) - } VERS_1; - ") - set(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS}) --set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/conftest.map") -+set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -Wl,--undefined-version "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/conftest.map") - check_c_source_compiles("int main(void){return 0;}" HAVE_LD_VERSION_SCRIPT) - set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE}) - file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map") diff --git a/graphics/tiff/files/patch-git-01-0dbcfc5bd2eaacf8be4f57f8b7cc7369d88fafa8 b/graphics/tiff/files/patch-git-01-0dbcfc5bd2eaacf8be4f57f8b7cc7369d88fafa8 new file mode 100644 index 000000000000..765bf56f26da --- /dev/null +++ b/graphics/tiff/files/patch-git-01-0dbcfc5bd2eaacf8be4f57f8b7cc7369d88fafa8 @@ -0,0 +1,52 @@ +From 0dbcfc5bd2eaacf8be4f57f8b7cc7369d88fafa8 Mon Sep 17 00:00:00 2001 +From: "Daniel E @diizzyy" +Date: Sun, 20 Oct 2024 22:45:15 +0200 +Subject: [PATCH] CMake: fix build with LLVM/Clang 17+ + +Fixes #651 +--- + cmake/LinkerChecks.cmake | 7 ++++++- + libtiff/CMakeLists.txt | 9 +++++++-- + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/cmake/LinkerChecks.cmake b/cmake/LinkerChecks.cmake +index ad1f0f9ff..90496bd2e 100644 +--- cmake/LinkerChecks.cmake ++++ cmake/LinkerChecks.cmake +@@ -39,7 +39,12 @@ VERS_2 { + } VERS_1; + ") + set(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS}) +-set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/conftest.map") ++if (CMAKE_VERSION GREATER_EQUAL 3.29 AND CMAKE_C_COMPILER_LINKER_ID STREQUAL "LLD" AND CMAKE_C_COMPILER_LINKER_VERSION GREATER_EQUAL 17) ++ set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -Wl,--undefined-version "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/conftest.map") ++else() ++ set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/conftest.map") ++endif() ++ + check_c_source_compiles("int main(void){return 0;}" HAVE_LD_VERSION_SCRIPT) + set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE}) + file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map") +diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt +index a8aa0c320..2762fab7c 100755 +--- libtiff/CMakeLists.txt ++++ libtiff/CMakeLists.txt +@@ -201,8 +201,13 @@ if(NOT CYGWIN) + set_target_properties(tiff PROPERTIES VERSION ${SO_VERSION}) + endif() + if(HAVE_LD_VERSION_SCRIPT) +- set_target_properties(tiff PROPERTIES LINK_FLAGS +- "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libtiff.map") ++ if (CMAKE_VERSION GREATER_EQUAL 3.29 AND CMAKE_C_COMPILER_LINKER_ID STREQUAL "LLD" AND CMAKE_C_COMPILER_LINKER_VERSION GREATER_EQUAL 17) ++ set_target_properties(tiff PROPERTIES LINK_FLAGS ++ "-Wl,--undefined-version -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libtiff.map") ++ else() ++ set_target_properties(tiff PROPERTIES LINK_FLAGS ++ "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libtiff.map") ++ endif() + endif() + + if(tiff-install) +-- +GitLab + diff --git a/graphics/tiff/files/patch-libtiff_CMakeLists.txt b/graphics/tiff/files/patch-libtiff_CMakeLists.txt deleted file mode 100644 index face49e28c9a..000000000000 --- a/graphics/tiff/files/patch-libtiff_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- libtiff/CMakeLists.txt.orig 2024-08-15 21:16:11 UTC -+++ libtiff/CMakeLists.txt -@@ -202,7 +202,7 @@ if(HAVE_LD_VERSION_SCRIPT) - endif() - if(HAVE_LD_VERSION_SCRIPT) - set_target_properties(tiff PROPERTIES LINK_FLAGS -- "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libtiff.map") -+ "-Wl,--undefined-version -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libtiff.map") - endif() - - if(tiff-install)