Merge pull request #1069 from arthenica/github-actions-fix

fix weekly builds
pull/1083/head
Taner Sener 7 months ago committed by GitHub
commit 17ea9e386f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 13
      scripts/android/libiconv.sh
  2. 3
      scripts/apple/libogg.sh

@ -1,8 +1,17 @@
#!/bin/bash
# INIT SUBMODULES
# FIX HARD-CODED PATHS
${SED_INLINE} 's|git://git.savannah.gnu.org|https://github.com/arthenica|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1
./gitsub.sh pull || return 1
ln -s -f $(which aclocal) ${BASEDIR}/.tmp/aclocal-1.16
ln -s -f $(which automake) ${BASEDIR}/.tmp/automake-1.16
PATH="${BASEDIR}/.tmp":$PATH
if [[ ! -d "${BASEDIR}"/src/"${LIB_NAME}"/gnulib ]]; then
# INIT SUBMODULES
./gitsub.sh pull || return 1
./gitsub.sh checkout gnulib 485d983b7795548fb32b12fbe8370d40789e88c4 || return 1
fi
# ALWAYS CLEAN THE PREVIOUS BUILD
make distclean 2>/dev/null 1>/dev/null

@ -8,9 +8,6 @@ if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_libogg} -e
autoreconf_library "${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1
fi
# FIX INCLUDE PATHS
${SED_INLINE} 's/sys\/types/stdint/g' ${BASEDIR}/src/libogg/include/ogg/os_types.h
./configure \
--prefix="${LIB_INSTALL_PREFIX}" \
--with-pic \

Loading…
Cancel
Save