From 2b8b24fe091ee0eb37b2d1c7509190626fcdbed4 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 19 Nov 2021 16:27:19 +0530 Subject: [PATCH] perl: Do not unset AR for global scope --- packages/perl/build.sh | 50 ++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/packages/perl/build.sh b/packages/perl/build.sh index 99974a09c..edee94b6b 100644 --- a/packages/perl/build.sh +++ b/packages/perl/build.sh @@ -39,36 +39,38 @@ termux_step_post_get_source() { termux_step_configure() { export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin - ORIG_AR=$AR; unset AR - ORIG_AS=$AS; unset AS - ORIG_CC=$CC; unset CC - ORIG_CXX=$CXX; unset CXX - ORIG_CPP=$CPP; unset CPP - ORIG_CFLAGS=$CFLAGS; unset CFLAGS - ORIG_CPPFLAGS=$CPPFLAGS; unset CPPFLAGS - ORIG_CXXFLAGS=$CXXFLAGS; unset CXXFLAGS - ORIG_LDFLAGS=$LDFLAGS; unset LDFLAGS - ORIG_RANLIB=$RANLIB; unset RANLIB - ORIG_LD=$LD; unset LD - # Since we specify $TERMUX_PREFIX/bin/sh below for the shell # it will be run during the build, so temporarily (removed in # termux_step_post_make_install below) setup symlink: rm -f $TERMUX_PREFIX/bin/sh ln -s /bin/sh $TERMUX_PREFIX/bin/sh - cd $TERMUX_PKG_BUILDDIR - $TERMUX_PKG_SRCDIR/configure \ - --target=$TERMUX_HOST_PLATFORM \ - -Dosname=android \ - -Dsysroot=$TERMUX_STANDALONE_TOOLCHAIN/sysroot \ - -Dprefix=$TERMUX_PREFIX \ - -Dsh=$TERMUX_PREFIX/bin/sh \ - -Dcc="$ORIG_CC" \ - -Dld="$ORIG_CC -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" \ - -Dar="$ORIG_AR" \ - -Duseshrplib \ - -Dusethreads + ( + ORIG_AR=$AR; unset AR + ORIG_AS=$AS; unset AS + ORIG_CC=$CC; unset CC + ORIG_CXX=$CXX; unset CXX + ORIG_CPP=$CPP; unset CPP + ORIG_CFLAGS=$CFLAGS; unset CFLAGS + ORIG_CPPFLAGS=$CPPFLAGS; unset CPPFLAGS + ORIG_CXXFLAGS=$CXXFLAGS; unset CXXFLAGS + ORIG_LDFLAGS=$LDFLAGS; unset LDFLAGS + ORIG_RANLIB=$RANLIB; unset RANLIB + ORIG_LD=$LD; unset LD + + cd $TERMUX_PKG_BUILDDIR + $TERMUX_PKG_SRCDIR/configure \ + --target=$TERMUX_HOST_PLATFORM \ + -Dosname=android \ + -Dsysroot=$TERMUX_STANDALONE_TOOLCHAIN/sysroot \ + -Dprefix=$TERMUX_PREFIX \ + -Dsh=$TERMUX_PREFIX/bin/sh \ + -Dcc="$ORIG_CC" \ + -Dld="$ORIG_CC -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" \ + -Dar="$ORIG_AR" \ + -Duseshrplib \ + -Dusethreads + ) } termux_step_post_make_install() {