From 04bd07c1c51dc1a0d17605ab7c5b51eeae82a148 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 22 Oct 2008 18:39:17 +0200 Subject: [PATCH] Adapt perl to linux. --HG-- extra : convert_revision : 0195de3a330193ea5caa9426ce893e682017e49c --- templates/perl-dont-hardcode-rpath.diff | 16 ---------------- templates/perl-runstuff-after-install.sh | 11 ----------- templates/perl-runstuff-before-build.sh | 9 +++++---- templates/perl.tmpl | 5 +++-- 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 templates/perl-dont-hardcode-rpath.diff delete mode 100644 templates/perl-runstuff-after-install.sh diff --git a/templates/perl-dont-hardcode-rpath.diff b/templates/perl-dont-hardcode-rpath.diff deleted file mode 100644 index 15293718a1e..00000000000 --- a/templates/perl-dont-hardcode-rpath.diff +++ /dev/null @@ -1,16 +0,0 @@ -Do not hardcode rpath dirs into binaries or modules that would cause -unexpected results with xbps. - ---- hints/netbsd.sh.orig 2008-10-02 01:03:43.000000000 +0200 -+++ hints/netbsd.sh 2008-10-02 01:04:38.000000000 +0200 -@@ -178,8 +178,8 @@ EOCBU - # Set sensible defaults for NetBSD: look for local software in - # /usr/pkg (NetBSD Packages Collection) and in /usr/local. - # --loclibpth="/usr/pkg/lib /usr/local/lib" --locincpth="/usr/pkg/include /usr/local/include" -+loclibpth="" -+locincpth="" - case "$rpathflag" in - '') - ldflags= diff --git a/templates/perl-runstuff-after-install.sh b/templates/perl-runstuff-after-install.sh deleted file mode 100644 index c8d9d905195..00000000000 --- a/templates/perl-runstuff-after-install.sh +++ /dev/null @@ -1,11 +0,0 @@ -# Fixup Config.pm to look at XBPS_MASTERDIR, this helps modules -# to use correct dirs while building/installing them. - -perl_arch=$(uname -m) -perl_libdir=$XBPS_DESTDIR/$pkgname-$version/lib/perl5 -config_pm=$perl_libdir/$version/$perl_arch-linux-thread-multi/Config.pm - -$sed_cmd -e "s|$XBPS_DESTDIR\/$pkgname-$version|$XBPS_MASTERDIR|g" \ - $config_pm > $config_pm.in -$chmod_cmd 444 $config_pm.in -$mv_cmd -f $config_pm.in $config_pm diff --git a/templates/perl-runstuff-before-build.sh b/templates/perl-runstuff-before-build.sh index 1c0e1b0bbbc..07befebfcb6 100644 --- a/templates/perl-runstuff-before-build.sh +++ b/templates/perl-runstuff-before-build.sh @@ -1,6 +1,7 @@ # This fixes the definitions that the perl binary uses to look at -# XBPS_MASTERDIR and not XBPS_DESTDIR! +# prefix and not XBPS_DESTDIR/MASTERDIR. -$sed_cmd -e "s|$XBPS_DESTDIR\/$pkgname-$version|$XBPS_MASTERDIR|g" \ - $wrksrc/config.h > $wrksrc/config.h.in && \ -$mv_cmd -f $wrksrc/config.h.in $wrksrc/config.h +$sed_cmd -i \ + -e "s|$XBPS_DESTDIR\/$pkgname-$version|/usr|g" \ + -e "s|$XBPS_MASTERDIR||g" \ + $wrksrc/config.h diff --git a/templates/perl.tmpl b/templates/perl.tmpl index f4d84553cd1..1c8e23fb1d2 100644 --- a/templates/perl.tmpl +++ b/templates/perl.tmpl @@ -1,11 +1,10 @@ # Template build file for 'perl'. pkgname=perl version=5.10.0 -patch_files="$pkgname-dont-hardcode-rpath.diff" distfiles="http://www.cpan.org/src/$pkgname-$version@.tar.gz" configure_script="./Configure" configure_args="-Dusethreads -des -Dprefix=$XBPS_DESTDIR/$pkgname-$version - -Ui_malloc -Uusemymalloc -Dinstallstyle=lib/perl5" + -Duselargefiles -Uusesfio -Dinstallstyle=lib/perl5" build_style=configure short_desc="Practical Extraction and Report Language" maintainer="Juan RP " @@ -20,3 +19,5 @@ long_desc=" procedural and object-oriented (OO) programming, has powerful built-in support for text processing, and has one of the world's most impressive collections of third-party modules." + +run_depends="glibc-2.8"