| 1 |
commit: 845833bbd940f60434c682562d516c5ace24c3e0 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 10 07:27:05 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 10 08:19:23 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=845833bb |
| 7 |
|
| 8 |
scripts/bootstrap-prefix: propagate *FLAGS to target too |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
scripts/bootstrap-prefix.sh | 16 ++++++++++++---- |
| 13 |
1 file changed, 12 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 16 |
index 9ce12729e3..cced408b42 100755 |
| 17 |
--- a/scripts/bootstrap-prefix.sh |
| 18 |
+++ b/scripts/bootstrap-prefix.sh |
| 19 |
@@ -1454,10 +1454,11 @@ do_emerge_pkgs() { |
| 20 |
done |
| 21 |
myuse=( ${myuse} ) |
| 22 |
|
| 23 |
- # Portage seems to ignore USE= for build dependencies. Since |
| 24 |
- # that's what we're more or less doing all the time, encode the |
| 25 |
- # USE-flags in profiles/use.mask and profiles/use.force which |
| 26 |
- # normally do not exist. |
| 27 |
+ # Portage seems to ignore USE=, *FLAGS for target dependencies. |
| 28 |
+ # Since that's what we're more or less doing all the time, |
| 29 |
+ # encode the USE-flags in profiles/use.mask and |
| 30 |
+ # profiles/use.force which normally do not exist. Get LDFLAGS |
| 31 |
+ # set through make.conf. |
| 32 |
rm -f "${EPREFIX}"/usr/portage/profiles/use.{mask,force} |
| 33 |
for use in "${myuse[@]}" ; do |
| 34 |
case "${use}" in |
| 35 |
@@ -1469,6 +1470,12 @@ do_emerge_pkgs() { |
| 36 |
;; |
| 37 |
esac |
| 38 |
done |
| 39 |
+ sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf |
| 40 |
+ { |
| 41 |
+ echo "CFLAGS=\"\${CFLAGS} ${OVERRIDE_CFLAGS}\" #stage3_temp#" |
| 42 |
+ echo "CXXFLAGS=\"\${CXXFLAGS} ${OVERRIDE_CXXFLAGS}\" #stage3_temp#" |
| 43 |
+ echo "LDFLAGS=\"\${LDFLAGS} ${LDFLAGS}\" #stage3_temp#" |
| 44 |
+ } >> "${EPREFIX}"/tmp/etc/portage/make.conf |
| 45 |
|
| 46 |
# Disable the STALE warning because the snapshot frequently gets stale. |
| 47 |
# |
| 48 |
@@ -1491,6 +1498,7 @@ do_emerge_pkgs() { |
| 49 |
) |
| 50 |
[[ $? -eq 0 ]] || return 1 |
| 51 |
rm -f "${EPREFIX}"/usr/portage/profiles/use.{mask,force} |
| 52 |
+ sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf |
| 53 |
|
| 54 |
case ${pkg},${CHOST} in |
| 55 |
app-shells/bash,*-cygwin*) |
Archives