[gentoo-commits] repo/proj/guru:master commit in: dev-lang/fbc/

[Ralph Seichter]

commit:     632a6d2d292602425035c47bd31f6b76a0857404
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Mon Apr 29 02:58:31 2019 +0000
Commit:     Ralph Seichter <gentoo <AT> seichter <DOT> 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 <vilhelm.gray <AT> 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() {