diff options
Diffstat (limited to 'abs/core/readline')
| -rw-r--r-- | abs/core/readline/PKGBUILD | 60 | ||||
| -rw-r--r-- | abs/core/readline/readline.install | 4 |
2 files changed, 42 insertions, 22 deletions
diff --git a/abs/core/readline/PKGBUILD b/abs/core/readline/PKGBUILD index e4c7716..489b22f 100644 --- a/abs/core/readline/PKGBUILD +++ b/abs/core/readline/PKGBUILD @@ -1,36 +1,56 @@ -# $Id: PKGBUILD 25790 2009-01-29 09:50:30Z allan $ +# $Id: PKGBUILD 82724 2010-06-16 04:51:23Z allan $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=readline -pkgver=5.2.013 -pkgrel=2 +_patchlevel=002 #prepare for some patches +pkgver=6.1.$_patchlevel +pkgrel=1 pkgdesc="GNU readline library" arch=(i686 x86_64) url="http://tiswww.case.edu/php/chet/readline/rltop.html" license=('GPL') -groups=('base') depends=('glibc' 'ncurses') backup=("etc/inputrc") -source=(ftp://ftp.cwru.edu/pub/bash/readline-${pkgver}.tar.gz - inputrc) -md5sums=('07666d8dabefdfc7fb328b14cd6ce843' - 'e5fc955f56d9fa5beb871f3279b8fa8b') +source=(http://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz + inputrc) +if [ $_patchlevel -gt 00 ]; then + for (( p=1; p<=$_patchlevel; p++ )); do + source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-6.1-patches/readline61-$(printf "%03d" $p)) + done +fi +md5sums=('fc2f7e714fe792db1ce6ddc4c9fb4ef3' + 'e5fc955f56d9fa5beb871f3279b8fa8b' + 'c642f2e84d820884b0bf9fd176bc6c3f' + '1a76781a1ea734e831588285db7ec9b1') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + cd ${srcdir}/${pkgname}-6.1 + for p in ../readline61-*; do + [ -e "$p" ] || continue + msg "applying patch ${p}" + patch -Np0 -i ${p} || return 1 + done + + # Remove RPATH from shared objects (FS#14366) + sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf + + # build with -fPIC for x86_64 (FS#15634) + [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" + + ./configure --prefix=/usr --libdir=/lib \ + --mandir=/usr/share/man --infodir=/usr/share/info make SHLIB_LIBS=-lncurses || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + make DESTDIR=${pkgdir} install || return 1 - mkdir -p ${startdir}/pkg/etc - install -m644 ../inputrc ${startdir}/pkg/etc/inputrc || return 1 + mkdir -p ${pkgdir}/etc + install -m644 ../inputrc ${pkgdir}/etc/inputrc || return 1 + #FHS recommends only shared libs in /lib + mkdir -p $pkgdir/usr/lib + mv $pkgdir/lib/*.a $pkgdir/usr/lib - cd ${startdir}/pkg - mkdir -pv lib - mv -v usr/lib/lib{readline,history}.so.5* lib/ || return 1 - ln -svf ../../lib/libreadline.so.5 usr/lib/libreadline.so || return 1 - ln -svf ../../lib/libhistory.so.5 usr/lib/libhistory.so || return 1 - - rm -f ${pkgdir}/usr/share/info/dir + # to make the linker find the shared lib and fix compile issues + cd ${pkgdir}/usr/lib + ln -sv /lib/libreadline.so . + ln -sv /lib/libhistory.so . } diff --git a/abs/core/readline/readline.install b/abs/core/readline/readline.install index 8e3de84..0d40c51 100644 --- a/abs/core/readline/readline.install +++ b/abs/core/readline/readline.install @@ -4,7 +4,7 @@ filelist=(history.info readline.info rluserman.info) post_install() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + install-info $infodir/$file.gz $infodir/dir 2> /dev/null done } @@ -16,7 +16,7 @@ post_upgrade() { pre_remove() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } |