From nobody Thu Jan 20 09:28:59 2022 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 A9B72197416D; Thu, 20 Jan 2022 09:28:59 +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 4Jfcdl1yS2z3m1n; Thu, 20 Jan 2022 09:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642670939; 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=+STCKUFBaqCOQBmjcucSHmuXo9j04gPImew93sf1Jhg=; b=UUBQI+9rWGwJXVk+AQanRs4B8LzScjf6pMW5WI4HrByX0tcLY1/9tdy3SxL9OaHbJIFrc6 mGUcOCjNrlffRz0w+u0E1JUJuc2nb63cN41J3a0XSsQo3iEm3cHQJyNYvtG2vF/ZtdOja7 8Wv78XPH3NPzZJjIwQ0yVObg2YC42wOb4mck5V04Q+HJdHy1FyX0SY3tjkrZ9jOXjh3P0o qoQMYT7tJorhW8CK2Kqj3v4gOw6+YdUfXenmjaaLebknfwZs1Eb4PkwoHPXsBM0/TOCSoW w0xjFHFpil5ClS+9cf+90gnkC+06zri17axUqbfFVOIDxzQXjyLHhc+weVK/GQ== 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 21B9F25C1E; Thu, 20 Jan 2022 09:28:59 +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 20K9Sxl9036934; Thu, 20 Jan 2022 09:28:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20K9SxkP036933; Thu, 20 Jan 2022 09:28:59 GMT (envelope-from git) Date: Thu, 20 Jan 2022 09:28:59 GMT Message-Id: <202201200928.20K9SxkP036933@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 08342c9812d7 - main - ports-mgmt/pkg-*: fix symbol collisions 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08342c9812d72301a3eba7b49f79c331ab708db5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642670939; 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=+STCKUFBaqCOQBmjcucSHmuXo9j04gPImew93sf1Jhg=; b=MjY1Xgh9ON+khhj+wQDUrkykN/EkxIQ188WZyuMIDLb7aTpa2KntOYQCCBtYP2XECAjs3W faJP870KKsVPgaRX7T24X1HBYT0oAAQjenQmJ/sNxNjzraExkLQv3UdereVpeANOPbtboM z39O1Xc7LyUCOBSUwYz48WaPvVVb0wSMjDB84RMNqovcUtcIUJLw0pb9QSkGqa2FOUdI8o cA4FMnvoc05h/pTJOH7s6Pb49LII4y1vFYUw8MwyTCdBV2x59lNZCOztRQnmDKVx7nZspp 9/VSenWntsPf7Zx+UBDSAOm/hYO0XtP+sK45dSEuf5GiT3YQiRK9RtkHmtGYng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642670939; a=rsa-sha256; cv=none; b=UTrTK9lzuAiow1ogkZshljzYWp42ytTYJs+aHh/KB+w4QdXANhdtYYs3oCq42s8bymCFUk nRxL68rxnYg067gPN1BCQSQ7Uhdy9dnKVUSYP7nQg3uQfyq3FfckWSN2o5Niaeuow6/i4i +pCcGlCpy5KWaS1ykS0HN7hwPExcogH8gTnBFyaa4c/7jWg3XSck+6P0uoT4Whl8bb7yde pxAcCo4xroUNduK8xPH8BfuTgrgjZEqIqdUzEBewe6HvpoGgMKgoR8QkPx51uB9TXcDaNa /10c+gbuDpLtDOPlVCHJlF5k4n9lLWBNERvqQ22ClJarYl/fzlH99DpUPk6Obg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=08342c9812d72301a3eba7b49f79c331ab708db5 commit 08342c9812d72301a3eba7b49f79c331ab708db5 Author: Baptiste Daroussin AuthorDate: 2022-01-20 08:22:47 +0000 Commit: Baptiste Daroussin CommitDate: 2022-01-20 09:28:54 +0000 ports-mgmt/pkg-*: fix symbol collisions while we fixed the symbol collision between libmd and libcrypto long ago in dynamic linked program, the collision is still there somehow for statically build programs. The manual check for liblzma_libs for static linking that was added long ago brings in a link to libmd before a link to libcrypto (this is since FreeBSD 13.0+ This manual check is not necessary anymore anyway, so let's drop it. Reported by: Franco Fitchner (from Opnsense) --- ports-mgmt/pkg-devel/Makefile | 12 +----------- ports-mgmt/pkg/Makefile | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 580d876d9193..2beaad8d5d37 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= pkg DISTVERSION= 1.17.99.9 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt PKGNAMESUFFIX= -devel @@ -43,13 +44,6 @@ CONFIGURE_ARGS+= --with-asan --with-ubsan #CONFIGURE_ARGS+= --default-format=tzst #.endif -.if !exists(/usr/libdata/pkgconfig/liblzma.pc) -LIBLZMA_LIBS= -llzma -.else -LIBLZMA_PC!= ${EGREP} ^Libs /usr/libdata/pkgconfig/liblzma.pc -LIBLZMA_LIBS= ${LIBLZMA_PC:M-l*} -.endif - .if defined(WITH_PKG) .if ${WITH_PKG} != devel . if !defined(PACKAGE_BUILDING) @@ -67,10 +61,6 @@ PKG_DEPENDS= PKG_BIN= ${WRKSRC}/src/pkg-static .endif -post-patch: - ${REINPLACE_CMD} -e "s|-llzma|${LIBLZMA_LIBS}|g" ${WRKSRC}/auto.def \ - ${WRKSRC}/src/Makefile.autosetup ${WRKSRC}/tests/Makefile.autosetup - .if ${PORT_OPTIONS:MSAN} post-build: @(cd ${WRKSRC}/src && \ diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 79d7c4427191..b031f2ebbe35 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,5 +1,6 @@ PORTNAME= pkg DISTVERSION= 1.17.5 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt #MASTER_SITES= \ @@ -70,13 +71,6 @@ pre-everything:: .endif .endif -.if !exists(/usr/libdata/pkgconfig/liblzma.pc) -LIBLZMA_LIBS= -llzma -.else -LIBLZMA_PC!= ${EGREP} ^Libs /usr/libdata/pkgconfig/liblzma.pc -LIBLZMA_LIBS= ${LIBLZMA_PC:M-l*} -.endif - #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= .undef INSTALLS_DEPENDS @@ -87,10 +81,6 @@ PKG_DEPENDS= PKG_BIN= ${WRKSRC}/src/pkg-static .endif -post-patch: - ${REINPLACE_CMD} -e "s|-llzma|${LIBLZMA_LIBS}|g" ${WRKSRC}/auto.def \ - ${WRKSRC}/src/Makefile.autosetup ${WRKSRC}/tests/Makefile.autosetup - post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg