diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2022-04-24 16:26:56 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2022-04-24 17:07:47 -0400 |
| commit | a2215adc4210cb2677d0457bddfb7d0be5cc7494 (patch) | |
| tree | 7ec8c3e23136c323ce34ac8e0d9c0155b953cc24 /dev-util/mingw64-runtime | |
| parent | x11-base/xorg-proto: Version bump to 2022.1 (diff) | |
| download | gentoo-a2215adc4210cb2677d0457bddfb7d0be5cc7494.tar.gz gentoo-a2215adc4210cb2677d0457bddfb7d0be5cc7494.tar.bz2 gentoo-a2215adc4210cb2677d0457bddfb7d0be5cc7494.zip | |
dev-util/mingw64-runtime: revert to old style cpp check
May return different error codes despite working properly,
cause unknown but ideally should look at doing this
differently. For now just revert to old behavior.
While here, add guard for headers-only. Not an issue per-se
given lib options don't matter, but it still uses wrong cpp
at that stage.
Closes: https://bugs.gentoo.org/840662
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-util/mingw64-runtime')
3 files changed, 18 insertions, 18 deletions
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0.ebuild index cf08ceab0f13..077a2a52ccd6 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0.ebuild @@ -88,12 +88,12 @@ src_configure() { $(crt-use_with libraries) $(crt-use_with tools) $( - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - </dev/null | grep -q __MINGW64__ - case ${PIPESTATUS[*]} in - '0 0') echo --disable-lib32 --enable-lib64;; - '0 1') echo --enable-lib32 --disable-lib64;; - *) die "failed check for __MINGW64__";; - esac + if use !headers-only; then + # not checking cpp errors due to bug #840662 + $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - </dev/null | grep -q __MINGW64__ \ + && echo --disable-lib32 --enable-lib64 \ + || echo --enable-lib32 --disable-lib64 + fi ) ) diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r2.ebuild index 78376aa3bcb5..8b0afea5649a 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r2.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r2.ebuild @@ -90,12 +90,12 @@ src_configure() { $(crt-use_with libraries) $(crt-use_with tools) $( - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - </dev/null | grep -q __MINGW64__ - case ${PIPESTATUS[*]} in - '0 0') echo --disable-lib32 --enable-lib64;; - '0 1') echo --enable-lib32 --disable-lib64;; - *) die "failed check for __MINGW64__";; - esac + if use !headers-only; then + # not checking cpp errors due to bug #840662 + $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - </dev/null | grep -q __MINGW64__ \ + && echo --disable-lib32 --enable-lib64 \ + || echo --enable-lib32 --disable-lib64 + fi ) ) diff --git a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r1.ebuild index cf08ceab0f13..077a2a52ccd6 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r1.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r1.ebuild @@ -88,12 +88,12 @@ src_configure() { $(crt-use_with libraries) $(crt-use_with tools) $( - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - </dev/null | grep -q __MINGW64__ - case ${PIPESTATUS[*]} in - '0 0') echo --disable-lib32 --enable-lib64;; - '0 1') echo --enable-lib32 --disable-lib64;; - *) die "failed check for __MINGW64__";; - esac + if use !headers-only; then + # not checking cpp errors due to bug #840662 + $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - </dev/null | grep -q __MINGW64__ \ + && echo --disable-lib32 --enable-lib64 \ + || echo --enable-lib32 --disable-lib64 + fi ) ) |