diff options
author | Treeve Jelbert | 2018-04-13 11:01:29 +0200 |
---|---|---|
committer | Treeve Jelbert | 2018-04-13 11:01:29 +0200 |
commit | 5a42b05b73632922b2bb6ace95fafd12d85c7236 (patch) | |
tree | a774f1f1e015c5672318fbfb549ee258e7cc0b38 | |
parent | 89c51347569bc99ad70c0dd3c124e8751dc80491 (diff) |
MESON_FUNCTIONS would cause .pc files to bad cflags arguments -I.
There were 2 '/' symbols following the '-I'
These flags then got propogated to other pkgconfig files, finally causing build
problems for things like qtwebengine
-rw-r--r-- | ChangeLog | 3 | ||||
-rwxr-xr-x | MESON_FUNCTIONS | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,6 @@ +2018-04-13 Treeve Jelbert <treeve@sourcemage.org> + * MESON_FUNCTIONS: tweak, prevent generation of dubious .pc files + 2018-04-12 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * archive/innoextract: new spell, an extractor for Inno Setup installers diff --git a/MESON_FUNCTIONS b/MESON_FUNCTIONS index ca69368e4d..7a346900cf 100755 --- a/MESON_FUNCTIONS +++ b/MESON_FUNCTIONS @@ -4,7 +4,8 @@ meson_build () { MESON_BUILD_TYPE="${MESON_BUILD_TYPE:-release}" # export LANG=$LC_ALL cd $SOURCE_DIRECTORY - SCRIPT="meson --prefix ${INSTALL_ROOT}/$PREFIX --buildtype ${MESON_BUILD_TYPE} \ +# do not put / before PREFIX + SCRIPT="meson --prefix ${INSTALL_ROOT}$PREFIX --buildtype ${MESON_BUILD_TYPE} \ --default-library shared --libdir lib" for LL in $OPTS; do SCRIPT+=" -D$LL" |