diff options
| author | alk3pInjection <webmaster@raspii.tech> | 2023-04-20 00:08:54 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2023-04-20 00:08:54 +0800 |
| commit | 004b98220a30de0d1956a8149d8bc6ec356667da (patch) | |
| tree | 1eaee2603984d7ab4524be68b57ce0a2b2b72118 /test/abicheck.sh | |
| parent | 2ca0d0b38b60e8d6d49a8959bf674a79e7d16f41 (diff) | |
| parent | a583e215afa2356e23b418efa871a1cc4348702a (diff) | |
Merge tag '2.0.7' into tachibanatachibana-mr1tachibana
Change-Id: I7b03d60d67d184c21ff7437a35062077666951e9
Diffstat (limited to 'test/abicheck.sh')
| -rwxr-xr-x | test/abicheck.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/abicheck.sh b/test/abicheck.sh index 89199a5..bc158e6 100755 --- a/test/abicheck.sh +++ b/test/abicheck.sh @@ -49,7 +49,7 @@ do --refresh) refresh=true ;; - --refresh_if) + --refresh-if) refresh_if=true ;; --help) @@ -71,11 +71,9 @@ then ABI_GIT_REPO=https://github.com/madler/zlib.git ABI_GIT_COMMIT=v1.2.11 else - # Reference should be the tag for zlib-ng 2.0 - # but until that bright, shining day, use some - # random recent SHA. Annoyingly, can't shorten it. + # Reference is zlib-ng 2.0.0 ABI_GIT_REPO=https://github.com/zlib-ng/zlib-ng.git - ABI_GIT_COMMIT=56ce27343bf295ae9457f8e3d38ec96d2f949a1c + ABI_GIT_COMMIT=2.0.0 fi # FIXME: even when using a tag, check the hash. @@ -94,7 +92,11 @@ then fi # Canonicalize CHOST to work around bug in original zlib's configure -export CHOST=$(sh $TESTDIR/../tools/config.sub $CHOST) +# (Don't export it if it wasn't already exported, else may cause +# default compiler detection failure and shared library link error +# when building both zlib and zlib-ng. +# See https://github.com/zlib-ng/zlib-ng/issues/1219) +CHOST=$(sh $TESTDIR/../tools/config.sub $CHOST) if test "$CHOST" = "" then @@ -121,7 +123,7 @@ then git reset --hard FETCH_HEAD cd .. # Build unstripped, uninstalled, very debug shared library - CFLAGS="$CFLAGS -ggdb" sh src.d/configure $CONFIGURE_ARGS + CFLAGS="$CFLAGS -ggdb" src.d/configure $CONFIGURE_ARGS make -j2 cd .. # Find shared library, extract its abi @@ -134,12 +136,10 @@ then # caching abi files in git (but that would slow builds down). fi -if test -f "$ABIFILE" +if ! test -f "$ABIFILE" then - ABIFILE="$ABIFILE" -else - echo "abicheck: SKIP: $ABIFILE not found; rerun with --refresh or --refresh_if" - exit 0 + echo "abicheck: SKIP: $ABIFILE not found; rerun with --refresh or --refresh-if" + exit 1 fi # Build unstripped, uninstalled, very debug shared library |