| 1 |
commit: 520d19cdb16fd9beb580b212a471e4b492e1fee6 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 28 16:09:40 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 28 16:23:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520d19cd |
| 7 |
|
| 8 |
Revert "meson.eclass: add _meson_move_flags function" |
| 9 |
|
| 10 |
This reverts commit 0fe549260636840b96dfd3b9f55b5bbf7ea1d6a3. |
| 11 |
|
| 12 |
This function is unnecessary; we can use lists for the relevant |
| 13 |
toolchain binaries instead. |
| 14 |
|
| 15 |
eclass/meson.eclass | 31 ------------------------------- |
| 16 |
1 file changed, 31 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 19 |
index d15e3ff5879..06e76092a6b 100644 |
| 20 |
--- a/eclass/meson.eclass |
| 21 |
+++ b/eclass/meson.eclass |
| 22 |
@@ -198,25 +198,6 @@ meson_use() { |
| 23 |
usex "$1" "-D${2-$1}=true" "-D${2-$1}=false" |
| 24 |
} |
| 25 |
|
| 26 |
-# @FUNCTION: _meson_move_flags |
| 27 |
-# @INTERNAL |
| 28 |
-# @USAGE: PROG FLAGS |
| 29 |
-# @DESCRIPTION: |
| 30 |
-# Moves extra arguments from PROG to FLAGS. |
| 31 |
-# For example: |
| 32 |
-# CC="gcc -m32" -> CC="gcc" CFLAGS="-m32" |
| 33 |
-_meson_move_flags() { |
| 34 |
- local prog=${1} |
| 35 |
- local flags=${2} |
| 36 |
- local x=( ${!prog} ) |
| 37 |
- if [[ -n ${x[0]} ]]; then |
| 38 |
- export ${prog}=${x[0]} |
| 39 |
- fi |
| 40 |
- if [[ -n ${x[1]} ]]; then |
| 41 |
- export ${flags}="${x[@]:1}${!flags:+ }${!flags}" |
| 42 |
- fi |
| 43 |
-} |
| 44 |
- |
| 45 |
# @FUNCTION: meson_src_configure |
| 46 |
# @DESCRIPTION: |
| 47 |
# This is the meson_src_configure function. |
| 48 |
@@ -233,18 +214,6 @@ meson_src_configure() { |
| 49 |
--wrap-mode nodownload |
| 50 |
) |
| 51 |
|
| 52 |
- # Prevent multilib flags from leaking across ABIs |
| 53 |
- local -x BUILD_CFLAGS=${BUILD_CFLAGS} |
| 54 |
- local -x BUILD_CXXFLAGS=${BUILD_CXXFLAGS} |
| 55 |
- |
| 56 |
- # Move multilib flags from CC to CFLAGS |
| 57 |
- local -x CC=$(tc-getCC) CFLAGS=${CFLAGS} |
| 58 |
- _meson_move_flags CC CFLAGS |
| 59 |
- |
| 60 |
- # Move multilib flags from CXX to CXXFLAGS |
| 61 |
- local -x CXX=$(tc-getCXX) CXXFLAGS=${CXXFLAGS} |
| 62 |
- _meson_move_flags CXX CXXFLAGS |
| 63 |
- |
| 64 |
if tc-is-cross-compiler; then |
| 65 |
_meson_create_cross_file || die "unable to write meson cross file" |
| 66 |
mesonargs+=( --cross-file "${T}/meson.${CHOST}" ) |
Archives