| 1 |
commit: 632a6d2d292602425035c47bd31f6b76a0857404 |
| 2 |
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Apr 29 02:58:31 2019 +0000 |
| 4 |
Commit: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Apr 29 03:00:09 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=632a6d2d |
| 7 |
|
| 8 |
dev-lang/fbc: Simplify definition of xcflags and fblflags |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 11 |
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com> |
| 12 |
|
| 13 |
dev-lang/fbc/fbc-1.06.0.ebuild | 14 ++++++++------ |
| 14 |
1 file changed, 8 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lang/fbc/fbc-1.06.0.ebuild b/dev-lang/fbc/fbc-1.06.0.ebuild |
| 17 |
index 8783039..ba5b069 100644 |
| 18 |
--- a/dev-lang/fbc/fbc-1.06.0.ebuild |
| 19 |
+++ b/dev-lang/fbc/fbc-1.06.0.ebuild |
| 20 |
@@ -69,10 +69,12 @@ src_compile() { |
| 21 |
cd "${S}" || die "cd failed" |
| 22 |
fi |
| 23 |
|
| 24 |
- local xcflags=$(usex gpm "" "-DDISABLE_GPM") |
| 25 |
- xcflags+=$(usex libffi "" " -DDISABLE_FFI") |
| 26 |
- xcflags+=$(usex opengl "" " -DDISABLE_OPENGL") |
| 27 |
- xcflags+=$(usex X "" " -DDISABLE_X11") |
| 28 |
+ local xcflags=( |
| 29 |
+ $(usex gpm "" "-DDISABLE_GPM") |
| 30 |
+ $(usex libffi "" " -DDISABLE_FFI") |
| 31 |
+ $(usex opengl "" " -DDISABLE_OPENGL") |
| 32 |
+ $(usex X "" " -DDISABLE_X11") |
| 33 |
+ ) |
| 34 |
|
| 35 |
# fbc automatically strips the executables it compiles; in order to avoid |
| 36 |
# creating striped executables, we override the fbc hardcoded linker "-s" |
| 37 |
@@ -81,10 +83,10 @@ src_compile() { |
| 38 |
# "--strip-debug" flag should be a safe option) |
| 39 |
local fblflags="-Wl --strip-debug " |
| 40 |
# fbc requires a space after the -Wl option |
| 41 |
- fblflags+=$(echo "${LDFLAGS}" | sed 's/-Wl,/-Wl /g') |
| 42 |
+ fblflags+=${LDFLAGS//-Wl,/-Wl } |
| 43 |
|
| 44 |
# Build fbc |
| 45 |
- emake CFLAGS="${CFLAGS} ${xcflags}" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" |
| 46 |
+ emake CFLAGS="${CFLAGS} ${xcflags[@]}" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" |
| 47 |
} |
| 48 |
|
| 49 |
src_install() { |
Archives