Mon Apr 25 23:16:50 2022 UTC ()
uchardet: no -Wl,--version-script on SunOS


(tnn)
diff -r1.1 -r1.2 pkgsrc/textproc/uchardet/Makefile
diff -r1.3 -r1.4 pkgsrc/textproc/uchardet/distinfo
diff -r0 -r1.1 pkgsrc/textproc/uchardet/patches/patch-src_symbols.cmake
cvs diff -r1.1 -r1.2 pkgsrc/textproc/uchardet/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/uchardet/Makefile 2020/06/09 13:53:00 1.1
+++ pkgsrc/textproc/uchardet/Makefile 2022/04/25 23:16:50 1.2
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1# $NetBSD: Makefile,v 1.1 2020/06/09 13:53:00 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2022/04/25 23:16:50 tnn Exp $
2 2
3DISTNAME= uchardet-0.0.7 3DISTNAME= uchardet-0.0.7
4CATEGORIES= textproc 4CATEGORIES= textproc
5MASTER_SITES= https://www.freedesktop.org/software/uchardet/releases/ 5MASTER_SITES= https://www.freedesktop.org/software/uchardet/releases/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.freedesktop.org/wiki/Software/uchardet/ 9HOMEPAGE= https://www.freedesktop.org/wiki/Software/uchardet/
10COMMENT= Encoding detector library ported from Mozilla 10COMMENT= Encoding detector library ported from Mozilla
11LICENSE= mpl-1.1 11LICENSE= mpl-1.1
12 12
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15 15
16TEST_TARGET= test 16TEST_TARGET= test
17 17
18# C++11 18# C++11
19GCC_REQD+= 4.7 19GCC_REQD+= 4.7
20 20
21PKGCONFIG_OVERRIDE+= uchardet.pc.in 21PKGCONFIG_OVERRIDE+= uchardet.pc.in
22 22
 23BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=${WRKSRC}/src/version.script
 24
23.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/textproc/uchardet/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/uchardet/distinfo 2021/10/26 11:23:36 1.3
+++ pkgsrc/textproc/uchardet/distinfo 2022/04/25 23:16:50 1.4
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.3 2021/10/26 11:23:36 nia Exp $ 1$NetBSD: distinfo,v 1.4 2022/04/25 23:16:50 tnn Exp $
2 2
3BLAKE2s (uchardet-0.0.7.tar.xz) = fc2c0211fda0d205366ed3d257a2dbb2a46768b163f488c765dfda1671d3b70c 3BLAKE2s (uchardet-0.0.7.tar.xz) = fc2c0211fda0d205366ed3d257a2dbb2a46768b163f488c765dfda1671d3b70c
4SHA512 (uchardet-0.0.7.tar.xz) = ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f 4SHA512 (uchardet-0.0.7.tar.xz) = ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
5Size (uchardet-0.0.7.tar.xz) = 215492 bytes 5Size (uchardet-0.0.7.tar.xz) = 215492 bytes
 6SHA1 (patch-src_symbols.cmake) = b0bfe9c32ce33037d50b2ffb7b94e0b787855601
File Added: pkgsrc/textproc/uchardet/patches/patch-src_symbols.cmake
$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(