Revert "perl: add -pie flag when compiling perl modules on arm and i686"
After clang symlinks were fixed inf32b2c0e7e
("libllvm: replace arm-linux-androideabi-clang symlink with wrapper") this should no longer be an issue for perl, -pie is automatically added when we target armv7a and api level >= 21. This reverts commit93fca0f5c3
.
This commit is contained in:
parent
f32b2c0e7e
commit
9b0735b7ce
|
@ -11,7 +11,7 @@ TERMUX_PKG_MAINTAINER="@termux"
|
||||||
# - subversion
|
# - subversion
|
||||||
TERMUX_PKG_VERSION=(5.34.0
|
TERMUX_PKG_VERSION=(5.34.0
|
||||||
1.3.6)
|
1.3.6)
|
||||||
TERMUX_PKG_REVISION=1
|
TERMUX_PKG_REVISION=2
|
||||||
TERMUX_PKG_SHA256=(551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a
|
TERMUX_PKG_SHA256=(551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a
|
||||||
4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5)
|
4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5)
|
||||||
TERMUX_PKG_SRCURL=(http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz
|
TERMUX_PKG_SRCURL=(http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz
|
||||||
|
@ -89,10 +89,4 @@ termux_step_post_make_install() {
|
||||||
sed 's',"--sysroot=$TERMUX_STANDALONE_TOOLCHAIN"/sysroot,"-I${TERMUX_PREFIX}/include",'g' Config_heavy.pl > Config_heavy.pl.new
|
sed 's',"--sysroot=$TERMUX_STANDALONE_TOOLCHAIN"/sysroot,"-I${TERMUX_PREFIX}/include",'g' Config_heavy.pl > Config_heavy.pl.new
|
||||||
sed 's',"$TERMUX_STANDALONE_TOOLCHAIN"/sysroot,"-I${TERMUX_PREFIX%%/usr}",'g' Config_heavy.pl.new > Config_heavy.pl
|
sed 's',"$TERMUX_STANDALONE_TOOLCHAIN"/sysroot,"-I${TERMUX_PREFIX%%/usr}",'g' Config_heavy.pl.new > Config_heavy.pl
|
||||||
rm Config_heavy.pl.new
|
rm Config_heavy.pl.new
|
||||||
|
|
||||||
# arm (and i686?) seem to explicitly need -pie set to be able
|
|
||||||
# to install some perl packages.
|
|
||||||
if [ "$TERMUX_ARCH" == "arm" ] || [ "$TERMUX_ARCH" == "i686" ]; then
|
|
||||||
sed -i "s@cc => '$ORIG_CC',@cc => '$ORIG_CC -pie',@g" Config.pm
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue