CVS commit: pkgsrc/textproc/uchardet

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Apr 25 23:16:50 UTC 2022

Modified Files:
        pkgsrc/textproc/uchardet: Makefile distinfo
Added Files:
        pkgsrc/textproc/uchardet/patches: patch-src_symbols.cmake

Log Message:
uchardet: no -Wl,--version-script on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/uchardet/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/uchardet/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/uchardet/patches/patch-src_symbols.cmake

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

Modified files:

Index: pkgsrc/textproc/uchardet/Makefile
diff -u pkgsrc/textproc/uchardet/Makefile:1.1 pkgsrc/textproc/uchardet/Makefile:1.2
--- pkgsrc/textproc/uchardet/Makefile:1.1       Tue Jun  9 13:53:00 2020
+++ pkgsrc/textproc/uchardet/Makefile   Mon Apr 25 23:16:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/06/09 13:53:00 nia Exp $
+# $NetBSD: Makefile,v 1.2 2022/04/25 23:16:50 tnn Exp $
 
 DISTNAME=      uchardet-0.0.7
 CATEGORIES=    textproc
@@ -20,4 +20,6 @@ GCC_REQD+=    4.7
 
 PKGCONFIG_OVERRIDE+=   uchardet.pc.in
 
+BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=${WRKSRC}/src/version.script
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/uchardet/distinfo
diff -u pkgsrc/textproc/uchardet/distinfo:1.3 pkgsrc/textproc/uchardet/distinfo:1.4
--- pkgsrc/textproc/uchardet/distinfo:1.3       Tue Oct 26 11:23:36 2021
+++ pkgsrc/textproc/uchardet/distinfo   Mon Apr 25 23:16:50 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:23:36 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/04/25 23:16:50 tnn Exp $
 
 BLAKE2s (uchardet-0.0.7.tar.xz) = fc2c0211fda0d205366ed3d257a2dbb2a46768b163f488c765dfda1671d3b70c
 SHA512 (uchardet-0.0.7.tar.xz) = ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
 Size (uchardet-0.0.7.tar.xz) = 215492 bytes
+SHA1 (patch-src_symbols.cmake) = b0bfe9c32ce33037d50b2ffb7b94e0b787855601

Added files:

Index: pkgsrc/textproc/uchardet/patches/patch-src_symbols.cmake
diff -u /dev/null pkgsrc/textproc/uchardet/patches/patch-src_symbols.cmake:1.1
--- /dev/null   Mon Apr 25 23:16:50 2022
+++ pkgsrc/textproc/uchardet/patches/patch-src_symbols.cmake    Mon Apr 25 23:16:50 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_symbols.cmake,v 1.1 2022/04/25 23:16:50 tnn Exp $
+
+Need to patch this to avoid cwrappers splitting -Wl,,
+Otherwise BUILDLINK_TRANSFORM cannot catch it.
+
+--- src/symbols.cmake.orig     2020-04-23 09:48:58.000000000 +0000
++++ src/symbols.cmake
+@@ -24,7 +24,7 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL G
+       set(_version_script "${CMAKE_CURRENT_BINARY_DIR}/version.script")
+       file(WRITE ${_version_script} "${_symbols}\n")
+ 
+-      set(LINK_FLAGS "${LINK_FLAGS} -Wl,--version-script,\"${_version_script}\"")
++      set(LINK_FLAGS "${LINK_FLAGS} -Wl,--version-script=\"${_version_script}\"")
+ endif (APPLE)
+ 
+ set_target_properties(