X-Git-Url: http://gitweb/?a=blobdiff_plain;f=libarchive%2FPkgfile;h=64018e5fbf2744e8193fc7fb7d71542f9d36c95b;hb=570111a970abdbc60f76e3761908d14749bfbbdb;hp=37968bf7787a2296b8ab94e51803df27427e9f4c;hpb=83e7e2d09802b3a99d4eda97a03cad72a1b1039a;p=crossrootfs.git

diff --git a/libarchive/Pkgfile b/libarchive/Pkgfile
index 37968bf..64018e5 100644
--- a/libarchive/Pkgfile
+++ b/libarchive/Pkgfile
@@ -1,21 +1,39 @@
 # Description: Library to create and read several archive formats
 # URL: http://people.freebsd.org/~kientzle/libarchive/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX-ARM System Team, devel@crux-arm.nu
-# Depends on: bzip2 zlib
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
+# Depends on: bzip2 xz zlib acl
 
 name=libarchive
-version=2.7.1
+version=3.0.4
 release=1
-source=(http://$name.googlecode.com/files/$name-$version.tar.gz)
+source=(https://github.com/downloads/$name/$name/$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
 }