X-Git-Url: http://gitweb/?a=blobdiff_plain;f=libarchive%2FPkgfile;h=7916aabca2c6535617553a8a2c787802a2511ebd;hb=66448b56d844b2ff0d64c60967f9d18672db2ee9;hp=cda1912ea6ddeeaf722897285c06cb4d699cbece;hpb=5333ef72c7d3e172ea2b639e695c0637baea9ac8;p=crossrootfs.git

diff --git a/libarchive/Pkgfile b/libarchive/Pkgfile
index cda1912..7916aab 100644
--- a/libarchive/Pkgfile
+++ b/libarchive/Pkgfile
@@ -5,12 +5,12 @@
 # Depends on: bzip2 xz zlib acl
 
 name=libarchive
-version=2.8.4
+version=3.1.2
 release=2
-source=(http://$name.googlecode.com/files/$name-$version.tar.gz)
+source=(http://www.libarchive.org/downloads/$name-$version.tar.gz)
 
 build() {
-  cd libarchive-$version
+  cd $name-$version
   # We're passing --without-lzmadec, because we want to use xz for
   # LZMA support, not the obsolete lzmadec library.
   #
@@ -18,6 +18,10 @@ build() {
   # to libraries which are only available in opt. XML support is only
   # needed for the xar format which we can live without.
 
+  # Fix libtool linking with host forcing our library path
+  sed -e "s|-rpath \$(libdir)|-rpath $CLFS/usr/lib|g" \
+      -e "s|\$(libarchive_la_LIBADD) \$(LIBS)|-L$CLFS/usr/lib|g" -i Makefile.in
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
@@ -26,6 +30,10 @@ build() {
               --without-xml2 \
               --without-expat \
               --without-openssl
+
+  # Forcing libtool to prioritize our sysroot
+  sed "s|lt_sysroot=|lt_sysroot=$CLFS|g" -i libtool
+
   make
   make DESTDIR=$PKG install
 }