sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid meson stripping DT_RUNPATH

Browse Source 
See #3490.
This commit is contained in:
Fredrik Fornwall 2019-03-10 23:58:37 +01:00
parent f24dca7956
commit 77d5eb17cf
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/gdk-pixbuf/build.sh
View File

@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/gdk-pixbuf/
TERMUX_PKG_DESCRIPTION="Library for image loading and manipulation" TERMUX_PKG_DESCRIPTION="Library for image loading and manipulation"
TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_VERSION=2.38.1 TERMUX_PKG_VERSION=2.38.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=f19ff836ba991031610dcc53774e8ca436160f7d981867c8c3a37acfe493ab3a TERMUX_PKG_SHA256=f19ff836ba991031610dcc53774e8ca436160f7d981867c8c3a37acfe493ab3a
TERMUX_PKG_SRCURL=ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${TERMUX_PKG_VERSION:0:4}/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${TERMUX_PKG_VERSION:0:4}/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo" TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo"

8
scripts/build/setup/termux_setup_meson.sh
View File

@ -1,7 +1,7 @@
termux_setup_meson() { termux_setup_meson() {
termux_setup_ninja termux_setup_ninja
local MESON_VERSION=0.49.2 local MESON_VERSION=0.49.2
local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION-v1 local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION-v2
if [ ! -d "$MESON_FOLDER" ]; then if [ ! -d "$MESON_FOLDER" ]; then
local MESON_TAR_NAME=meson-$MESON_VERSION.tar.gz local MESON_TAR_NAME=meson-$MESON_VERSION.tar.gz
local MESON_TAR_FILE=$TERMUX_PKG_TMPDIR/$MESON_TAR_NAME local MESON_TAR_FILE=$TERMUX_PKG_TMPDIR/$MESON_TAR_NAME
@ -11,6 +11,12 @@ termux_setup_meson() {
"$MESON_TAR_FILE" \ "$MESON_TAR_FILE" \
ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd
tar xf "$MESON_TAR_FILE" -C "$TERMUX_PKG_TMPDIR" tar xf "$MESON_TAR_FILE" -C "$TERMUX_PKG_TMPDIR"
# Avoid meson stripping away DT_RUNPATH, see
# (https://github.com/NetBSD/pkgsrc/commit/2fb2c013715a6374b4e2d1f8e9f2143e827f0f64
# and https://github.com/mesonbuild/meson/issues/314):
perl -p -i -e 's/self.fix_rpathtype_entry\(new_rpath, DT_RUNPATH\)//' \
$MESON_TMP_FOLDER/mesonbuild/scripts/depfixer.py
mv "$MESON_TMP_FOLDER" "$MESON_FOLDER" mv "$MESON_TMP_FOLDER" "$MESON_FOLDER"
fi fi
TERMUX_MESON="$MESON_FOLDER/meson.py" TERMUX_MESON="$MESON_FOLDER/meson.py"