From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5374259CB2 for ; Wed, 13 Apr 2016 18:41:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5B1321C012; Wed, 13 Apr 2016 18:41:35 +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 158A821C012 for ; Wed, 13 Apr 2016 18:41:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3EE06340DB7 for ; Wed, 13 Apr 2016 18:41:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19BA9822 for ; Wed, 13 Apr 2016 18:41:30 +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: <1460572840.ab7c08d07012cc807a506a10625b44e9fcb1cc97.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.ebuild X-VCS-Directories: sys-fs/squashfs-tools/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: ab7c08d07012cc807a506a10625b44e9fcb1cc97 X-VCS-Branch: master Date: Wed, 13 Apr 2016 18:41:30 +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: b8360fef-3208-4692-a91e-b178439481f3 X-Archives-Hash: ce85a236182730855cafae5d51a5f083 commit: ab7c08d07012cc807a506a10625b44e9fcb1cc97 Author: Mike Frysinger gentoo org> AuthorDate: Wed Apr 13 18:28:18 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Apr 13 18:40:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7c08d0 sys-fs/squashfs-tools: cleanup/fix configure options sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild index dc96dda..ae89fac 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild @@ -27,21 +27,23 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/squashfs${PV}/${PN}" +use10() { usex $1 1 2 ; } + src_configure() { # set up make command line variables in EMAKE_SQUASHFS_CONF EMAKE_SQUASHFS_CONF=( - $(usex lzma LZMA_XZ_SUPPORT=1 LZMA_XS_SUPPORT=0) - $(usex lzo LZO_SUPPORT=1 LZO_SUPPORT=0) - $(usex lz4 LZ4_SUPPORT=1 LZ4_SUPPORT=0) - $(usex xattr XATTR_SUPPORT=1 XATTR_SUPPORT=0) - $(usex xz XZ_SUPPORT=1 XZ_SUPPORT=0) + LZMA_XZ_SUPPORT=$(use10 lzma) + LZO_SUPPORT=$(use10 lzo) + LZ4_SUPPORT=$(use10 lz4) + XATTR_SUPPORT=$(use10 xattr) + XZ_SUPPORT=$(use10 xz) ) tc-export CC } src_compile() { - emake ${EMAKE_SQUASHFS_CONF[@]} + emake "${EMAKE_SQUASHFS_CONF[@]}" } src_install() {