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

diff --git a/readline/Pkgfile b/readline/Pkgfile
index 07d97f8..d4c9bbc 100644
--- a/readline/Pkgfile
+++ b/readline/Pkgfile
@@ -1,23 +1,37 @@
 # 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
-release=1
-source=(http://ftp.gnu.org/gnu/$name/$name-5.2.tar.gz \
-        $name-5.2-001-013.patch inputrc)
+version=6.3.8
+release=2
+source=(http://ftp.gnu.org/gnu/$name/$name-${version::3}.tar.gz \
+        $name-$version.patch.gz inputrc $name-$version-wcwidth.patch)
 
 build() {
-  cd $name-5.2
-  patch -p0 -i $SRC/$name-5.2-001-013.patch
+  cd $name-${version::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
+
+   # Patch to avoid wcwidth tests
+  patch -i $SRC/$name-$version-wcwidth.patch
+
   ./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
+
   install -D -m 644 $SRC/inputrc $PKG/etc/inputrc
-  rm -rf $PKG/usr/info
+  rm -r $PKG/usr/share/{doc,info}
 }