* Update xar to 1.6.1
* xar: Don't check for OpenSSL_add_all_ciphers()
This commit is contained in:
Thomas Pöchtrager 2017-03-28 17:48:49 +02:00
parent 6f603a9c0a
commit 474f359d2f
4 changed files with 32 additions and 2 deletions

View File

@ -206,8 +206,14 @@ if [ $NEED_XAR -ne 0 ]; then
extract $TARBALL_DIR/xar*.tar.gz 2 extract $TARBALL_DIR/xar*.tar.gz 2
pushd xar* &>/dev/null pushd xar* &>/dev/null
[ $PLATFORM == "NetBSD" ] && patch -p0 -l < $PATCH_DIR/xar-netbsd.patch if [ $PLATFORM == "NetBSD" ]; then
CFLAGS+=" -w" ./configure --prefix=$TARGET_DIR patch -p0 -l < $PATCH_DIR/xar-netbsd.patch
fi
patch -p0 < $PATCH_DIR/xar-ext2.patch
# https://github.com/tpoechtrager/osxcross/issues/109
ac_cv_lib_crypto_OpenSSL_add_all_ciphers=yes \
CFLAGS+=" -w" \
./configure --prefix=$TARGET_DIR
$MAKE -j$JOBS $MAKE -j$JOBS
$MAKE install -j$JOBS $MAKE install -j$JOBS
popd &>/dev/null popd &>/dev/null

24
patches/xar-ext2.patch Normal file
View File

@ -0,0 +1,24 @@
--- lib/ext2.c.orig
+++ lib/ext2.c
@@ -139,8 +139,10 @@
if(! (flags & ~EXT2_NOCOMPR_FL) )
x_addprop(f, "NoCompBlock");
#endif
+#ifdef EXT2_ECOMPR_FL
if(! (flags & ~EXT2_ECOMPR_FL) )
x_addprop(f, "CompError");
+#endif
if(! (flags & ~EXT2_BTREE_FL) )
x_addprop(f, "BTree");
if(! (flags & ~EXT2_INDEX_FL) )
@@ -225,8 +227,10 @@
if( e2prop_get(f, "NoCompBlock", (char **)&tmp) == 0 )
flags |= EXT2_NOCOMPR_FL ;
#endif
+#ifdef EXT2_ECOMPR_FL
if( e2prop_get(f, "CompError", (char **)&tmp) == 0 )
flags |= EXT2_ECOMPR_FL ;
+#endif
if( e2prop_get(f, "BTree", (char **)&tmp) == 0 )
flags |= EXT2_BTREE_FL ;
if( e2prop_get(f, "HashIndexed", (char **)&tmp) == 0 )

Binary file not shown.

BIN
tarballs/xar-1.6.1.tar.gz Normal file

Binary file not shown.