Fix glib meson.build and bump exiftool and geth on CI
This commit is contained in:
parent
23d8566b1f
commit
5251d2d3ec
@ -12,7 +12,7 @@ termux_step_make_install() {
|
||||
|
||||
install -Dm700 "$TERMUX_PKG_SRCDIR"/exiftool "$TERMUX_PREFIX"/bin/exiftool
|
||||
find "$TERMUX_PKG_SRCDIR"/lib -name "*.pod" -delete
|
||||
mkdir -p "$TERMUX_PREFIX/lib/perl5/site_perl/${current_perl_version}"
|
||||
mkdir -p "$TERMUX_PREFIX/lib/perl5/site_perl/$current_perl_version"
|
||||
rm -rf "$TERMUX_PREFIX/lib/perl5/site_perl/${current_perl_version}"/{Image,File}
|
||||
cp -a "$TERMUX_PKG_SRCDIR"/lib/{Image,File} "$TERMUX_PREFIX/lib/perl5/site_perl/${current_perl_version}/"
|
||||
}
|
||||
|
@ -10,7 +10,7 @@ termux_step_make() {
|
||||
termux_setup_golang
|
||||
|
||||
export GOPATH=$TERMUX_PKG_BUILDDIR
|
||||
mkdir -p "$GOPATH"/src/github.com/ethereum
|
||||
mkdir -p "${GOPATH}"/src/github.com/ethereum
|
||||
ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/ethereum/go-ethereum
|
||||
|
||||
cd "$GOPATH"/src/github.com/ethereum/go-ethereum
|
||||
|
@ -19,7 +19,7 @@ diff -u -r ../glib-2.60.2/meson.build ./meson.build
|
||||
- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
|
||||
-else
|
||||
+have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
|
||||
+if False
|
||||
+if host_system != 'android'
|
||||
# First just find the bare library.
|
||||
libintl = cc.find_library('intl', required : false)
|
||||
# The bare library probably won't link without help if it's static.
|
||||
|
Loading…
x
Reference in New Issue
Block a user