chiark
/
gitweb
/
~mdw
/
termux-packages
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f0c1439
)
Different meson cross files for different arches
author
Fredrik Fornwall
<fredrik@fornwall.net>
Sat, 29 Jul 2017 00:14:47 +0000
(
02:14
+0200)
committer
Fredrik Fornwall
<fredrik@fornwall.net>
Sat, 29 Jul 2017 00:14:47 +0000
(
02:14
+0200)
build-package.sh
patch
|
blob
|
blame
|
history
diff --git
a/build-package.sh
b/build-package.sh
index da5a3c8b209416ec0f1f948f42f6bed321feb180..1c95b1d075a3f2f252ea72798e41d2f82522c6e3 100755
(executable)
--- a/
build-package.sh
+++ b/
build-package.sh
@@
-119,7
+119,7
@@
termux_setup_meson() {
(cd $MESON_FOLDER && patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch)
fi
TERMUX_MESON="$MESON_FOLDER/meson.py"
(cd $MESON_FOLDER && patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch)
fi
TERMUX_MESON="$MESON_FOLDER/meson.py"
- TERMUX_MESON_CROSSFILE=$TERMUX_COMMON_CACHEDIR/meson-crossfile-v1.txt
+ TERMUX_MESON_CROSSFILE=$TERMUX_COMMON_CACHEDIR/meson-crossfile-
$TERMUX_ARCH-
v1.txt
if [ ! -f $TERMUX_MESON_CROSSFILE ]; then
local MESON_CPU MESON_CPU_FAMILY
if [ $TERMUX_ARCH = "arm" ]; then
if [ ! -f $TERMUX_MESON_CROSSFILE ]; then
local MESON_CPU MESON_CPU_FAMILY
if [ $TERMUX_ARCH = "arm" ]; then