From owner-svn-ports-all@freebsd.org Sat Jun 20 21:26:47 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9362D33537D; Sat, 20 Jun 2020 21:26:47 +0000 (UTC) (envelope-from delphij@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49q7zC3S9bz3f10; Sat, 20 Jun 2020 21:26:47 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71E661297F; Sat, 20 Jun 2020 21:26:47 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05KLQlem065917; Sat, 20 Jun 2020 21:26:47 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05KLQlPq065915; Sat, 20 Jun 2020 21:26:47 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <202006202126.05KLQlPq065915@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sat, 20 Jun 2020 21:26:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r539752 - in branches/2020Q2/ports-mgmt: pkg pkg-devel X-SVN-Group: ports-branches X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in branches/2020Q2/ports-mgmt: pkg pkg-devel X-SVN-Commit-Revision: 539752 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jun 2020 21:26:47 -0000 Author: delphij Date: Sat Jun 20 21:26:46 2020 New Revision: 539752 URL: https://svnweb.freebsd.org/changeset/ports/539752 Log: MFH: r539750 r539751 ports-mgmt/pkg: Respect liblzma.pc if available. ports-mgmt/pkg-devel: Respect liblzma.pc if available. Note that this is meant to be a temporary hack and will be reverted once the freebsd/pkg have solved this in the build infrastructure. PR: 200142 Approved by: portmgr (bapt over IRC) Modified: branches/2020Q2/ports-mgmt/pkg-devel/Makefile branches/2020Q2/ports-mgmt/pkg/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/ports-mgmt/pkg-devel/Makefile ============================================================================== --- branches/2020Q2/ports-mgmt/pkg-devel/Makefile Sat Jun 20 21:23:02 2020 (r539751) +++ branches/2020Q2/ports-mgmt/pkg-devel/Makefile Sat Jun 20 21:26:46 2020 (r539752) @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.13.99.7 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt PKGNAMESUFFIX= -devel @@ -35,6 +36,13 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .include +.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) @@ -51,6 +59,10 @@ PKG_DEPENDS= .if !exists(${LOCALBASE}/sbin/pkg) && !defined(CROSS_TOOLCHAIN) 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 Modified: branches/2020Q2/ports-mgmt/pkg/Makefile ============================================================================== --- branches/2020Q2/ports-mgmt/pkg/Makefile Sat Jun 20 21:23:02 2020 (r539751) +++ branches/2020Q2/ports-mgmt/pkg/Makefile Sat Jun 20 21:26:46 2020 (r539752) @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.13.2 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt #MASTER_SITES= \ @@ -71,6 +72,13 @@ 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 @@ -80,6 +88,10 @@ PKG_DEPENDS= .if !defined(CROSS_TOOLCHAIN) 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-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}