X-Git-Url: http://gitweb/?a=blobdiff_plain;ds=sidebyside;f=readline%2FPkgfile;h=47122f252deb76b503f2e2dad26099ed07878bc2;hb=2c26c989882b1f0d4d843939b4152856c9859013;hp=e7b7d676ab69b6af7dd1a0dec6bc898b468da0ca;hpb=70e50f03ead219258ad3eb119a610d1ae3216efa;p=crossrootfs.git

diff --git a/readline/Pkgfile b/readline/Pkgfile
index e7b7d67..47122f2 100644
--- a/readline/Pkgfile
+++ b/readline/Pkgfile
@@ -1,24 +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=6.0.4
-release=2
-source=(http://ftp.gnu.org/gnu/$name/$name-${version%.*}.tar.gz \
-        $name-6.0-001-004.patch inputrc)
+version=7.0.3
+release=1
+source=(http://ftpmirror.gnu.org/gnu/$name/$name-${version:0:3}.tar.gz
+        $name-$version.patch.gz inputrc)
 
 build() {
-  cd $name-${version%.*}
-  patch -p0 -i $SRC/$name-6.0-001-004.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 \
-              --mandir=/usr/man
-  make
-  make DESTDIR=$PKG install
+              --prefix=/usr
+  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/share/info
+  rm -r $PKG/usr/share/{doc,info}
 }