From nobody Tue Apr 18 21:55:52 2023 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 4Q1HmT69QJz45klm; Tue, 18 Apr 2023 21:55:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q1HmT1Gc0z4JVG; Tue, 18 Apr 2023 21:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854953; 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=+dJphC4CP9cyLIy126/L0C8gcDxKpnYdsooOn7PiX+s=; b=Uu7yAtq9S73ATZlPBdCTAghi7HnYy9RlawB4LXmHAPd/PyVspob9fTv1gaqa8jrGi8RTpV yAPZzXsvbpLiKVMRSE5P8bU+EQKCCe+f2uUzF44FkMLocggqxL4lZUSRLhZPt/T3Aq7CW8 sBVasnSUItGmn9WcWODsVxk5nZVaAfMD1DYJ4TPxFnCSEurbvrGvbfzkw2W40aJ6V/YVtL lJ5OiofEfWyTSHclcugGgtEmcDTqHvE1rPnEUd+7AK5imV4Y7lKpOAWEpwY5PQj37i03he 7EF/83TWjNdtaV6pc31nkTV1jdPr+h1LejBOfMLa0wpXEdsRBkwrE/bWMXL4jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854953; 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=+dJphC4CP9cyLIy126/L0C8gcDxKpnYdsooOn7PiX+s=; b=PVWHr6T6hSwsGObC+zDSYtoeT2ewjHyZyUqV+xvSVCnnB5CjeR7+efFgVnw4sCFuDg9HFz 04MbSdFvugPXOv4l57ZbZ3ARIIwo++/k9xJ80gBidbGcM/UX+Fd+GI5fvpSz/2P4Ec3456 u1ko+9npA0Rkz3rcr5EeYF8y9zac/DYLLBsb0Dms7H1LVwt9o/BRJBLgbzzwusyipTfGya RPpsSDalCOOlpSDfZ350SJl7Pz5jOt73LQKn9BMxuk+WMYer515gdlu/Yh+yLpZxf9bHLM 7PbfKXkU/DCSHjIffHdzqZIEGNfWelbxwTpGpkkDuwiCGVNQwhh0jaLGjWoNwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681854953; a=rsa-sha256; cv=none; b=YM/A1+jp4by3pfkMiwStHVbudTTZbkmZKvyF3KZW5CY1S4QHQAb2I1R6pJK0Rss9Q/NlwJ aYpnIUS0Ps2abX/ZDOvMbWs0LrWTwvONcaPMrrZ95dXjeiKlFPSwtUGPrXm/dWTYVGZ06E kB35ZMHSWEIr1Vwzk+JACDa4Y7MEv6KFXM/ENqEFXfZh58eqCqQ5o3F8cUtHTc4OLo9Dj9 eZ0yAy7lIdV/CKqoA7dHInr+T6jguI+dKT50HxBPTwooM6+Sr5hGgRcbvLKH3bgV3CS2CA bT4RDJwZ6KbamvGNgKZoHmPcKq4Bkg0tf0SoWZ31pEWupRKsaW7mb++kGtHQ8A== 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 4Q1HmT0HP4zTrs; Tue, 18 Apr 2023 21:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ILtqrm062665; Tue, 18 Apr 2023 21:55:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ILtqmm062664; Tue, 18 Apr 2023 21:55:52 GMT (envelope-from git) Date: Tue, 18 Apr 2023 21:55:52 GMT Message-Id: <202304182155.33ILtqmm062664@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 0861f30e1cf4 - main - textproc/turboxsl: work around duplicate symbol issue 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0861f30e1cf4a2ef74fbc58f8566fa0077ec76c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=0861f30e1cf4a2ef74fbc58f8566fa0077ec76c4 commit 0861f30e1cf4a2ef74fbc58f8566fa0077ec76c4 Author: Robert Clausecker AuthorDate: 2023-04-17 14:57:15 +0000 Commit: Robert Clausecker CommitDate: 2023-04-18 21:55:29 +0000 textproc/turboxsl: work around duplicate symbol issue Add -fcommon to CFLAGS to work around a duplicate symbol issue. This fixes the build on FreeBSD 13+. While we are at it, enable on arm64 (builds fine). Approved by: portmgr (build fix blanket) --- textproc/turboxsl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/textproc/turboxsl/Makefile b/textproc/turboxsl/Makefile index c26d23ba6cd7..ba51888fe3cc 100644 --- a/textproc/turboxsl/Makefile +++ b/textproc/turboxsl/Makefile @@ -10,9 +10,7 @@ WWW= https://github.com/Litres/turboxsl LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_13= ld: error: duplicate symbol: xsl_a_NaN -BROKEN_FreeBSD_14= ld: error: duplicate symbol: xsl_a_NaN -ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le sparc64 +ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le sparc64 LIB_DEPENDS= libck.so:devel/concurrencykit \ libmemcached.so:databases/libmemcached @@ -21,7 +19,9 @@ USES= autoreconf libtool pathfix pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= Litres + GNU_CONFIGURE= yes +CFLAGS+= -fcommon CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip