Browse Source

Fix liblo tests

Signed-off-by: falkTX <falktx@falktx.com>
pull/28/head
falkTX 1 year ago
parent
commit
8f8fb05a3f
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 6 additions and 3 deletions
  1. +5
    -2
      bootstrap-plugins.sh
  2. +1
    -1
      setup/env.sh

+ 5
- 2
bootstrap-plugins.sh View File

@@ -408,7 +408,7 @@ fi # PAWPAW_SKIP_GLIB

LIBLO_EXTRAFLAGS="--enable-threads --disable-examples --disable-tools"

if [ -z "${PAWPAW_SKIP_TESTS}" ] || [ "${PAWPAW_SKIP_TESTS}" -eq 0 ]; then
if [ -n "${PAWPAW_SKIP_TESTS}" ] && [ "${PAWPAW_SKIP_TESTS}" -eq 1 ]; then
LIBLO_EXTRAFLAGS+=" --disable-tests"
fi

@@ -418,13 +418,16 @@ if [ "${MACOS}" -eq 1 ]; then
if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
LIBLO_EXTRAFLAGS+=" ac_cv_c_bigendian=universal"
fi
# use of wrong macro, should be _WIN32
elif [ "${MACOS}" -eq 1 ]; then
export EXTRA_CFLAGS="-DWIN32"
fi

download liblo "${LIBLO_VERSION}" "${LIBLO_URL}"
build_autoconf liblo "${LIBLO_VERSION}" "${LIBLO_EXTRAFLAGS}"

# FIXME tests fail on macOS
if [ -z "${PAWPAW_SKIP_TESTS}" ] || [ "${PAWPAW_SKIP_TESTS}" -eq 0 ] && [ "${MACOS}" -eq 0 ]; then
if ([ -z "${PAWPAW_SKIP_TESTS}" ] || [ "${PAWPAW_SKIP_TESTS}" -eq 0 ]) && [ "${MACOS}" -eq 0 ]; then
run_make liblo "${LIBLO_VERSION}" check
fi



+ 1
- 1
setup/env.sh View File

@@ -65,7 +65,7 @@ if [ -z "${PAWPAW_SKIP_LTO}" ] || [ "${PAWPAW_SKIP_LTO}" -eq 0 ]; then
PAWPAW_PREFIX+="-lto"
fi

if [ -n "${PAWPAW_NOSIMD}" ] && [ "${PAWPAW_NOSIMD}" -ne 0 ]; then
if [ -n "${PAWPAW_NOSIMD}" ] && [ "${PAWPAW_NOSIMD}" -eq 1 ]; then
PAWPAW_BUILDDIR+="-nosimd"
PAWPAW_PREFIX+="-nosimd"
fi


Loading…
Cancel
Save