From: <sv...@op...> - 2024-07-31 11:23:43
|
Author: manx Date: Wed Jul 31 13:23:31 2024 New Revision: 21314 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21314 Log: [Fix] build: Autotools: Support macOS tar. Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh ============================================================================== --- trunk/OpenMPT/build/autotools/autoconfiscate.sh Wed Jul 31 11:54:14 2024 (r21313) +++ trunk/OpenMPT/build/autotools/autoconfiscate.sh Wed Jul 31 13:23:31 2024 (r21314) @@ -11,17 +11,25 @@ echo "Detecting OS ..." UNAME_S="$(uname -s)" -if [[ $UNAME_S == *"BSD"* ]]; then - if [[ $UNAME_S == "OpenBSD" ]]; then + +case $UNAME_S in + Darwin) + TAR_FLAVOUR=mac + MAKE=make + ;; + OpenBSD) TAR_FLAVOUR=bsd - else + MAKE=gmake + ;; + *BSD*) TAR_FLAVOUR=libarchive - fi - MAKE=gmake -else - TAR_FLAVOUR=gnu - MAKE=make -fi + MAKE=gmake + ;; + *) + TAR_FLAVOUR=gnu + MAKE=make + ;; +esac echo "Gathering version ..." . libopenmpt/libopenmpt_version.mk @@ -276,11 +284,14 @@ cp *.tar.gz libopenmpt/src.autotools/$MPT_LIBOPENMPT_VERSION/ case $TAR_FLAVOUR in + mac) + tar -cv -f ../dist-autotools.tar libopenmpt + ;; bsd) tar -cv -N -f ../dist-autotools.tar libopenmpt ;; libarchive) - tar -cv --numeric-owner --uname "" --gname "" --uid 0 --gid 0 -f ../dist-autotools.tar libopenmpt + tar -cv --numeric-owner --uname "" --gname "" --uid 0 --gid 0 -f ../dist-autotools.tar libopenmpt ;; gnu) tar -cv --numeric-owner --owner=0 --group=0 -f ../dist-autotools.tar libopenmpt |