Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AF48184D3A for ; Mon, 19 Jun 2023 19:59:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id un_88RzmnR2Z for ; Mon, 19 Jun 2023 19:59:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 05E6284CFA for ; Mon, 19 Jun 2023 19:59:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EE0E2FA89; Mon, 19 Jun 2023 19:59:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1687204781273100" MIME-Version: 1.0 Date: Mon, 19 Jun 2023 19:59:41 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/textproc/libxslt To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20230619195941.EE0E2FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1687204781273100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Mon Jun 19 19:59:41 UTC 2023 Modified Files: pkgsrc/textproc/libxslt: Makefile Log Message: libxslt: don't pass --version-script to Solaris linker. Fixes "ld: fatal: option --version-script requires option -z gnu-version-script-compat to be specified" on Solaris 11.4. Tested to build as before on Tribblix, and therefore hopefully SmartOS. NFCI on non-"SunOS" platforms. To generate a diff of this commit: cvs rdiff -u -r1.127 -r1.128 pkgsrc/textproc/libxslt/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1687204781273100 Content-Disposition: inline Content-Length: 1073 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/libxslt/Makefile diff -u pkgsrc/textproc/libxslt/Makefile:1.127 pkgsrc/textproc/libxslt/Makefile:1.128 --- pkgsrc/textproc/libxslt/Makefile:1.127 Thu Jun 15 23:41:52 2023 +++ pkgsrc/textproc/libxslt/Makefile Mon Jun 19 19:59:41 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.127 2023/06/15 23:41:52 riastradh Exp $ +# $NetBSD: Makefile,v 1.128 2023/06/19 19:59:41 schmonz Exp $ .include "Makefile.common" @@ -15,10 +15,17 @@ PKGCONFIG_OVERRIDE= libxslt.pc.in PKGCONFIG_OVERRIDE+= libexslt.pc.in TEST_TARGET= check -BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,./libxslt.syms:-Wl,./libxslt_solaris.syms .include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == SunOS +. if ${OS_VARIANT} == Solaris +BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=./libxslt.syms +. else +BUILDLINK_TRANSFORM+= opt:-Wl,./libxslt.syms:-Wl,./libxslt_solaris.syms +. endif +.endif + .if ${USE_CROSS_COMPILE:tl} == "yes" # Both libgcrypt and libxml2 install scripts in the _target_ system, # that are expected to be run on the _build_ system when compiling --_----------=_1687204781273100--