CVS commit: pkgsrc/graphics/charls

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Sat Oct 21 11:20:23 UTC 2023

Modified Files:
        pkgsrc/graphics/charls: Makefile distinfo
Added Files:
        pkgsrc/graphics/charls/patches: patch-src_CMakeLists.txt

Log Message:
charls: use platform independent cmake configure check for --version-script


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/charls/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/charls/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/charls/patches/patch-src_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/charls/Makefile
diff -u pkgsrc/graphics/charls/Makefile:1.5 pkgsrc/graphics/charls/Makefile:1.6
--- pkgsrc/graphics/charls/Makefile:1.5 Mon Oct  2 20:03:25 2023
+++ pkgsrc/graphics/charls/Makefile     Sat Oct 21 11:20:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/10/02 20:03:25 nros Exp $
+# $NetBSD: Makefile,v 1.6 2023/10/21 11:20:23 nros Exp $
 
 DISTNAME=      charls-2.4.2
 CATEGORIES=    graphics
@@ -15,8 +15,6 @@ USE_CXX_FEATURES+=    c++14
 CMAKE_ARGS+=   -DBUILD_SHARED_LIBS:BOOL=ON
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
 
-BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=${WRKSRC}/src/charls.version
-
 PKGCONFIG_OVERRIDE=    src/charls-template.pc
 
 .include "../../devel/cmake/build.mk"

Index: pkgsrc/graphics/charls/distinfo
diff -u pkgsrc/graphics/charls/distinfo:1.6 pkgsrc/graphics/charls/distinfo:1.7
--- pkgsrc/graphics/charls/distinfo:1.6 Mon Oct  2 20:03:25 2023
+++ pkgsrc/graphics/charls/distinfo     Sat Oct 21 11:20:23 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2023/10/02 20:03:25 nros Exp $
+$NetBSD: distinfo,v 1.7 2023/10/21 11:20:23 nros Exp $
 
 BLAKE2s (charls-2.4.2.tar.gz) = ee060b858c2980aef68cd8b30a5df251a729d049030add418ffacdbe0be90eb0
 SHA512 (charls-2.4.2.tar.gz) = 4f1b587f008956ab6fb9d2473c37a7b1a842633113245be7f8bb29b8c64304a6d580a29fcfca97ba1ac75adedbaf89e29adc4ac9e4117e1af1aa5949dbd34df9
 Size (charls-2.4.2.tar.gz) = 9492449 bytes
+SHA1 (patch-src_CMakeLists.txt) = 2cd5a7112837cd1ac69f0c3a34e213eaecaa9428

Added files:

Index: pkgsrc/graphics/charls/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/charls/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null   Sat Oct 21 11:20:23 2023
+++ pkgsrc/graphics/charls/patches/patch-src_CMakeLists.txt     Sat Oct 21 11:20:23 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2023/10/21 11:20:23 nros Exp $
+
+Not all unix ld commands support --version_script ,
+check if it works before using it
+
+--- src/CMakeLists.txt.orig    2023-10-21 11:00:42.582420428 +0000
++++ src/CMakeLists.txt
+@@ -78,9 +78,10 @@ set_property(TARGET charls PROPERTY PUBL
+ 
+ set_target_properties(charls PROPERTIES
+   LINK_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/charls.version)
+-if(UNIX AND NOT APPLE)
+-  set_property(TARGET charls APPEND_STRING PROPERTY
+-    LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/charls.version")
++include(CheckLinkerFlag)
++check_linker_flag(CXX "LINKER:--version-script=${CMAKE_CURRENT_LIST_DIR}/charls.version" versionscript_flag)
++if(versionscript_flag)
++  target_link_options(charls PRIVATE "LINKER:--version-script=${CMAKE_CURRENT_LIST_DIR}/charls.version")
+ endif()
+ 
+ target_sources(charls