Skip to content

Commit

Permalink
macos fix 4
Browse files Browse the repository at this point in the history
  • Loading branch information
antmak committed Dec 1, 2023
1 parent 260ccc5 commit a01c1e9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/scripts/configure-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,17 @@ set -euo pipefail
TARGET=${TARGET:-xtensa-softmmu}
VERSION=${VERSION:-dev}

sed -i='' "s/project('qemu', \['c'\],/project('qemu', \['c', 'objc'\],/" meson.build
sed -i '' "s/project('qemu', \['c'\],/project('qemu', \['c', 'objc'\],/" meson.build

# workaround for some headers that macOS couldn't find for some unknown reason
sed -i='' "s/common_user_inc = \[\]/common_user_inc = \['include', 'build'\]/" meson.build
sed -i '' "s/common_user_inc = \[\]/common_user_inc = \['include', 'build'\]/" meson.build

echo DBG
./configure --help

./configure \
--bindir=bin \
--datadir=share/qemu \
--disable-capstone \
--disable-cocoa \
--disable-coreaudio \
--disable-docs \
--disable-user \
--disable-vnc \
--enable-gcrypt \
--enable-sdl \
--enable-slirp \
Expand All @@ -30,4 +24,5 @@ echo DBG
--target-list=${TARGET} \
--with-pkgversion="${VERSION}" \
--with-suffix="" \
--without-default-features \
|| { cat meson-logs/meson-log.txt && false; }
2 changes: 1 addition & 1 deletion .github/workflows/scripts/prerequisites-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if [ -f "${PYFIX_FILE}" ] ; then
python3 -m pip install --upgrade pip
python3 -m pip install looseversion

sed -i='' "s/distutils.version/looseversion/" "${PYFIX_FILE}"
sed -i '' "s/distutils.version/looseversion/" "${PYFIX_FILE}"
fi

# dbg
Expand Down

0 comments on commit a01c1e9

Please sign in to comment.