From 5fa37384d33e1700950ce12417450742996fdb26 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 15 Feb 2015 13:20:20 +0100 Subject: [PATCH] perl: fix cross compilation and create libperl.so symlink as well. --- srcpkgs/perl/template | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index 0b0ddd4ebb..04443eefa6 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -188,8 +188,8 @@ do_build() { export LIB=$XBPS_CROSS_BASE/usr/lib export INCLUDE=$XBPS_CROSS_BASE/usr/include - make SHRPLDFLAGS='-shared -Wl,-soname,libperl.so.${revision}.${patchlevel}' \ - CROSS_PERL=$HOST_PERL libperl.so.${version%.*} ${makejobs} + make SHRPLDFLAGS="-shared -Wl,-soname,libperl.so.${version%.*}" \ + CROSS_PERL=$HOST_PERL libperl.so ${makejobs} cp -fr $HOST_PERL_LIBS/auto/* lib/auto/ mkdir -p lib/$XBPS_CROSS_TRIPLET @@ -250,7 +250,14 @@ do_install() { find ${DESTDIR} -name .packlist -delete # Make a symlink so that libperl.so is accesible. - rm -f ${DESTDIR}/usr/lib/perl5/core_perl/CORE/libperl.so + if [ "$CROSS_BUILD" ]; then + mv ${DESTDIR}/usr/lib/perl5/core_perl/CORE/libperl.so \ + ${DESTDIR}/usr/lib/perl5/core_perl/CORE/libperl.so.${version%.*} + else + rm -f ${DESTDIR}/usr/lib/perl5/core_perl/CORE/libperl.so + fi + rm -f ${DESTDIR}/usr/lib/perl5/core_perl/CORE/libperl.so ln -sfr ${DESTDIR}/usr/lib/perl5/core_perl/CORE/libperl.so.${version%.*} \ ${DESTDIR}/usr/lib/libperl.so.${version%.*} + ln -s libperl.so.${version%.*} ${DESTDIR}/usr/lib/libperl.so }