X-Git-Url: http://gitweb/?a=blobdiff_plain;f=libarchive%2FPkgfile;h=7916aabca2c6535617553a8a2c787802a2511ebd;hb=refs%2Fheads%2F3.1;hp=3572d484a31a242d8d8c4706f3650bc8cfd6792f;hpb=715b604769bc1561c9cc71ab8b01ef10c3f7a492;p=crossrootfs.git

diff --git a/libarchive/Pkgfile b/libarchive/Pkgfile
index 3572d48..7916aab 100644
--- a/libarchive/Pkgfile
+++ b/libarchive/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on: bzip2 xz zlib acl
 
 name=libarchive
-version=3.0.4
-release=1
-source=(https://github.com/downloads/$name/$name/$name-$version.tar.gz)
+version=3.1.2
+release=2
+source=(http://www.libarchive.org/downloads/$name-$version.tar.gz)
 
 build() {
   cd $name-$version
@@ -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
 }