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 21967138334 for ; Mon, 29 Apr 2019 14:12:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED568E08A0; Mon, 29 Apr 2019 14:12:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3617E08A0 for ; Mon, 29 Apr 2019 14:11:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17508342ED0 for ; Mon, 29 Apr 2019 14:11:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65B775C7 for ; Mon, 29 Apr 2019 14:11:55 +0000 (UTC) From: "Ralph Seichter" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ralph Seichter" Message-ID: <1556506809.632a6d2d292602425035c47bd31f6b76a0857404.ralph-seichter@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-lang/fbc/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-lang/fbc/fbc-1.06.0.ebuild X-VCS-Directories: dev-lang/fbc/ X-VCS-Committer: ralph-seichter X-VCS-Committer-Name: Ralph Seichter X-VCS-Revision: 632a6d2d292602425035c47bd31f6b76a0857404 X-VCS-Branch: master Date: Mon, 29 Apr 2019 14:11:55 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e5f64c89-01a4-4840-a9ea-75d547b7be9c X-Archives-Hash: 21eae1ec7db2fe7d3b9861dd5bd55546 commit: 632a6d2d292602425035c47bd31f6b76a0857404 Author: William Breathitt Gray gmail com> AuthorDate: Mon Apr 29 02:58:31 2019 +0000 Commit: Ralph Seichter seichter de> CommitDate: Mon Apr 29 03:00:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=632a6d2d dev-lang/fbc: Simplify definition of xcflags and fblflags Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: William Breathitt Gray gmail.com> dev-lang/fbc/fbc-1.06.0.ebuild | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-lang/fbc/fbc-1.06.0.ebuild b/dev-lang/fbc/fbc-1.06.0.ebuild index 8783039..ba5b069 100644 --- a/dev-lang/fbc/fbc-1.06.0.ebuild +++ b/dev-lang/fbc/fbc-1.06.0.ebuild @@ -69,10 +69,12 @@ src_compile() { cd "${S}" || die "cd failed" fi - local xcflags=$(usex gpm "" "-DDISABLE_GPM") - xcflags+=$(usex libffi "" " -DDISABLE_FFI") - xcflags+=$(usex opengl "" " -DDISABLE_OPENGL") - xcflags+=$(usex X "" " -DDISABLE_X11") + local xcflags=( + $(usex gpm "" "-DDISABLE_GPM") + $(usex libffi "" " -DDISABLE_FFI") + $(usex opengl "" " -DDISABLE_OPENGL") + $(usex X "" " -DDISABLE_X11") + ) # fbc automatically strips the executables it compiles; in order to avoid # creating striped executables, we override the fbc hardcoded linker "-s" @@ -81,10 +83,10 @@ src_compile() { # "--strip-debug" flag should be a safe option) local fblflags="-Wl --strip-debug " # fbc requires a space after the -Wl option - fblflags+=$(echo "${LDFLAGS}" | sed 's/-Wl,/-Wl /g') + fblflags+=${LDFLAGS//-Wl,/-Wl } # Build fbc - emake CFLAGS="${CFLAGS} ${xcflags}" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" + emake CFLAGS="${CFLAGS} ${xcflags[@]}" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" } src_install() {