From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2181C1395E2 for ; Thu, 10 Nov 2016 05:24:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82865E0879; Thu, 10 Nov 2016 05:24:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58D14E0879 for ; Thu, 10 Nov 2016 05:24:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CD2A341658 for ; Thu, 10 Nov 2016 05:24:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5E66A7 for ; Thu, 10 Nov 2016 05:24:24 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1478755457.bf63c51cfab3bcbbfdf60cb9833c44b812932ca2.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild sys-fs/squashfs-tools/squashfs-tools-9999.ebuild X-VCS-Directories: sys-fs/squashfs-tools/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: bf63c51cfab3bcbbfdf60cb9833c44b812932ca2 X-VCS-Branch: master Date: Thu, 10 Nov 2016 05:24:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 25241607-6ef1-4695-93fd-9d51aa0eb5d9 X-Archives-Hash: 797dd1c6b720b570b054669140c1061d commit: bf63c51cfab3bcbbfdf60cb9833c44b812932ca2 Author: Mike Frysinger gentoo org> AuthorDate: Thu Nov 10 05:24:17 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Nov 10 05:24:17 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf63c51c sys-fs/squashfs-tools: add USE=static support sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild | 25 +++++++++++---------- sys-fs/squashfs-tools/squashfs-tools-9999.ebuild | 26 ++++++++++++---------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild index 74247ab..047b874 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit eutils toolchain-funcs +inherit eutils toolchain-funcs flag-o-matic DEB_VER="3" @@ -15,18 +15,18 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="lz4 lzma lzo xattr +xz" +IUSE="lz4 lzma lzo static xattr +xz" -RDEPEND=" - sys-libs/zlib - !xz? ( !lzo? ( sys-libs/zlib ) ) - lz4? ( app-arch/lz4 ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo ) - xattr? ( sys-apps/attr ) - xz? ( app-arch/xz-utils ) -" -DEPEND="${RDEPEND}" +LIB_DEPEND="sys-libs/zlib[static-libs(+)] + !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) + lz4? ( app-arch/lz4[static-libs(+)] ) + lzma? ( app-arch/xz-utils[static-libs(+)] ) + lzo? ( dev-libs/lzo[static-libs(+)] ) + xattr? ( sys-apps/attr[static-libs(+)] ) + xz? ( app-arch/xz-utils[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" S="${WORKDIR}/squashfs${PV}/${PN}" @@ -53,6 +53,7 @@ src_configure() { ) tc-export CC + use static && append-ldflags -static } src_compile() { diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild index 85558e8..7815a95 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils git-r3 toolchain-funcs + +inherit eutils git-r3 toolchain-funcs flag-o-matic DEB_VER="3" @@ -15,18 +16,18 @@ EGIT_REPO_URI=" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="lz4 lzma lzo xattr +xz" +IUSE="lz4 lzma lzo static xattr +xz" -RDEPEND=" - sys-libs/zlib - !xz? ( !lzo? ( sys-libs/zlib ) ) - lz4? ( app-arch/lz4 ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo ) - xattr? ( sys-apps/attr ) - xz? ( app-arch/xz-utils ) -" -DEPEND="${RDEPEND}" +LIB_DEPEND="sys-libs/zlib[static-libs(+)] + !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) + lz4? ( app-arch/lz4[static-libs(+)] ) + lzma? ( app-arch/xz-utils[static-libs(+)] ) + lzo? ( dev-libs/lzo[static-libs(+)] ) + xattr? ( sys-apps/attr[static-libs(+)] ) + xz? ( app-arch/xz-utils[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" PATCHES=( "${FILESDIR}"/${PN}-4.3-sysmacros.patch @@ -49,6 +50,7 @@ src_configure() { ) tc-export CC + use static && append-ldflags -static } src_compile() {