X-Git-Url: http://gitweb/?a=blobdiff_plain;f=libarchive%2FPkgfile;h=e17a4a4c6444f5f9436e8532171bc8de27f4c693;hb=93c27dff84a2054070b5156517bd40f43e88cb00;hp=aa8c1dfb39352f77881f9293341f76cbbb2c44cb;hpb=b751b192b8a9f558df99b4050babc1b84d45a372;p=crossrootfs.git

diff --git a/libarchive/Pkgfile b/libarchive/Pkgfile
index aa8c1df..e17a4a4 100644
--- a/libarchive/Pkgfile
+++ b/libarchive/Pkgfile
@@ -2,20 +2,37 @@
 # URL: http://people.freebsd.org/~kientzle/libarchive/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-# Depends on: bzip2 zlib
+# Depends on: bzip2 xz zlib acl
 
 name=libarchive
-version=2.7.1
-release=1
-source=(http://$name.googlecode.com/files/$name-$version.tar.gz)
+version=3.1.2
+release=2
+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.
+  #
+  # We're passing --without-xml2 and --without-expat to avoid linking
+  # 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 \
-              --mandir=/usr/man \
-              --disable-xattr
+              --without-lzmadec \
+              --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
 }