X-Git-Url: http://gitweb/?a=blobdiff_plain;f=readline%2FPkgfile;h=47122f252deb76b503f2e2dad26099ed07878bc2;hb=a11d64f24049d3e681a337c1ba26332ffd2652b4;hp=07d97f803ea461c23791f7258587a9481fb322e8;hpb=6dca1d213a39ee6af51632926e8b7c8914215cd9;p=crossrootfs.git

diff --git a/readline/Pkgfile b/readline/Pkgfile
index 07d97f8..47122f2 100644
--- a/readline/Pkgfile
+++ b/readline/Pkgfile
@@ -1,23 +1,38 @@
 # Description: Lets users edit command lines as they are typed in
 # URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dot dyndns dot org
-# Depends on:
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
+# Depends on: ncurses
 
 name=readline
-version=5.2.13
+version=7.0.3
 release=1
-source=(http://ftp.gnu.org/gnu/$name/$name-5.2.tar.gz \
-        $name-5.2-001-013.patch inputrc)
+source=(http://ftpmirror.gnu.org/gnu/$name/$name-${version:0:3}.tar.gz
+        $name-$version.patch.gz inputrc)
 
 build() {
-  cd $name-5.2
-  patch -p0 -i $SRC/$name-5.2-001-013.patch
+  cd $name-${version:0:3}
+
+  gunzip -c $SRC/$name-$version.patch.gz | patch -p0
+
+  # Don't use rpath for linking the shared libs
+  sed -i '117s/-Wl,-rpath,$(libdir)//' support/shobj-conf
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr
-  make
-  make DESTDIR=$PKG install
+  make -j1 SHLIB_LIBS=-lncurses
+  make -j1 DESTDIR=$PKG install
+
+  install -d $PKG/lib
+  mv $PKG/usr/lib/lib*.so.* $PKG/lib
+  ln -sf ../../lib/libhistory.so.${version:0:3} $PKG/usr/lib/libhistory.so
+  ln -sf ../../lib/libreadline.so.${version:0:3} $PKG/usr/lib/libreadline.so
+
+  # Compatibility symlinks, remove later
+  ln -s libreadline.so.7.0 $PKG/lib/libreadline.so.6
+  ln -s libhistory.so.7.0 $PKG/lib/libhistory.so.6
+
   install -D -m 644 $SRC/inputrc $PKG/etc/inputrc
-  rm -rf $PKG/usr/info
+  rm -r $PKG/usr/share/{doc,info}
 }