Skip to content

Allow building without an x86_64 meson install #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 1.18
Choose a base branch
from
Open

Allow building without an x86_64 meson install #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SourcesAndScripts/Scripts/cairo_build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ export CFLAGS="${CFLAGS_X86_64}"
export CXXFLAGS="${CXXFLAGS_X86_64}"
patch -b -p0 < "${SCRIPTS_PATH}/cairo.patch"
mkdir -p "build/cairo"
arch -x86_64 /opt/homebrew_x86_64/bin/meson setup --wrap-mode=nofallback --default-library=shared --buildtype=release -Ddwrite=disabled -Dfontconfig=enabled -Dfreetype=enabled -Dpng=enabled -Dquartz=enabled -Dtee=enabled -Dxcb=disabled -Dxlib=disabled -Dxlib-xcb=disabled -Dzlib=enabled -Dtests=disabled -Dglib=enabled -Dgtk_doc=false . "build"
arch -x86_64 /opt/homebrew_x86_64/bin/meson compile -C build --verbose
arch -x86_64 zsh -c 'meson setup --wrap-mode=nofallback --default-library=shared --buildtype=release -Ddwrite=disabled -Dfontconfig=enabled -Dfreetype=enabled -Dpng=enabled -Dquartz=enabled -Dtee=enabled -Dxcb=disabled -Dxlib=disabled -Dxlib-xcb=disabled -Dzlib=enabled -Dtests=disabled -Dglib=enabled -Dgtk_doc=false . build'
arch -x86_64 zsh -c 'meson compile -C build --verbose'

# Build arm64
cd "${SOURCES_PATH}/cairo-${CAIRO_VERSION}-arm64"
Expand Down
8 changes: 4 additions & 4 deletions SourcesAndScripts/Scripts/glib_build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ check_pcre2
check_libffi
check_gettext

if ! [ is_apple_silicon_mac ]; then
echo "Error: Boost requires Apple Silicon mac to build universal libs" >&2
if ! is_apple_silicon_mac; then
echo "Error: Glib requires Apple Silicon mac to build universal libs" >&2
exit 1
fi

Expand All @@ -52,12 +52,12 @@ export CFLAGS="${CFLAGS_X86_64} -Wno-implicit-function-declaration"
export CXXFLAGS="${CXXFLAGS_X86_64} -Wno-implicit-function-declaration"
patch -b -p0 < "${SCRIPTS_PATH}/glib.patch"
mkdir -p "build/glib"
arch -x86_64 /opt/homebrew_x86_64/bin/meson setup --wrap-mode=nofallback -Dbsymbolic_functions=false -Ddtrace=false --default-library=shared --buildtype=release . "build"
arch -x86_64 zsh -c 'meson setup --wrap-mode=nofallback -Dbsymbolic_functions=false -Ddtrace=false --default-library=shared --buildtype=release . build'
cd "build/glib"
ln -s "${LIBS_PATH}/libpcre2-8.0.dylib" "libpcre2-8.dylib"
ln -s "${LIBS_PATH}/libintl.8.dylib"
cd ..
arch -x86_64 /opt/homebrew_x86_64/bin/ninja
arch -x86_64 zsh -c ninja

# Build arm64
cd "${SOURCES_PATH}/glib-${GLIB_VERSION}-arm64"
Expand Down
8 changes: 4 additions & 4 deletions SourcesAndScripts/Scripts/harfbuzz_build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ check_gettext
check_freetype
check_graphite2

if ! [ is_apple_silicon_mac ]; then
echo "Error: Boost requires Apple Silicon mac to build universal libs" >&2
if ! is_apple_silicon_mac; then
echo "Error: Harfbuzz requires Apple Silicon mac to build universal libs" >&2
exit 1
fi

Expand All @@ -53,9 +53,9 @@ export LDFLAGS="${LDFLAGS_X86_64}"
export CFLAGS="${CFLAGS_X86_64}"
export CXXFLAGS="${CXXFLAGS_X86_64}"
mkdir "build"
arch -x86_64 /opt/homebrew_x86_64/bin/meson -Dgraphite=enabled -Dcoretext=enabled -Dintrospection=disabled --buildtype=release --default-library=shared --wrap-mode=nofallback . "build"
arch -x86_64 zsh -c 'meson -Dgraphite=enabled -Dcoretext=enabled -Dintrospection=disabled --buildtype=release --default-library=shared --wrap-mode=nofallback . build'
cd "build"
arch -x86_64 /opt/homebrew_x86_64/bin/ninja
arch -x86_64 zsh -c ninja

# Build arm64
cd "${SOURCES_PATH}/harfbuzz-${HARFBUZZ_VERSION}-arm64"
Expand Down
10 changes: 5 additions & 5 deletions SourcesAndScripts/Scripts/pango_build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ check_fribidi
check_meson
check_ninja

if ! [ is_apple_silicon_mac ]; then
echo "Error: Boost requires Apple Silicon mac to build universal libs" >&2
if ! is_apple_silicon_mac; then
echo "Error: Pango requires Apple Silicon mac to build universal libs" >&2
exit 1
fi

Expand All @@ -58,9 +58,9 @@ export LDFLAGS="${LDFLAGS_X86_64}"
export CFLAGS="${CFLAGS_X86_64}"
export CXXFLAGS="${CXXFLAGS_X86_64}"
mkdir "build"
sed -i -e "/-Werror=unused-but-set-variable/d" "meson.build"
arch -x86_64 /opt/homebrew_x86_64/bin/meson setup -Dintrospection=disabled -Djson-glib:introspection=disabled -Djson-glib:tests=false -Dfontconfig=enabled -Dcairo=enabled -Dfreetype=enabled --default-library=shared --buildtype=release --wrap-mode=nofallback . "build"
arch -x86_64 /opt/homebrew_x86_64/bin/meson compile -C build --verbose
sed -i '' "/-Werror=unused-but-set-variable/d" "meson.build"
arch -x86_64 zsh -c 'meson setup -Dintrospection=disabled -Djson-glib:introspection=disabled -Djson-glib:tests=false -Dfontconfig=enabled -Dcairo=enabled -Dfreetype=enabled --default-library=shared --buildtype=release --wrap-mode=nofallback . build'
arch -x86_64 zsh -c 'meson compile -C build --verbose'

# Build arm64
cd "${SOURCES_PATH}/pango-${PANGO_VERSION}-arm64"
Expand Down