diff --git a/build.sh b/build.sh index e0ad458..5c0a82c 100755 --- a/build.sh +++ b/build.sh @@ -206,8 +206,14 @@ if [ $NEED_XAR -ne 0 ]; then extract $TARBALL_DIR/xar*.tar.gz 2 pushd xar* &>/dev/null -[ $PLATFORM == "NetBSD" ] && patch -p0 -l < $PATCH_DIR/xar-netbsd.patch -CFLAGS+=" -w" ./configure --prefix=$TARGET_DIR +if [ $PLATFORM == "NetBSD" ]; then + 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 install -j$JOBS popd &>/dev/null diff --git a/patches/xar-ext2.patch b/patches/xar-ext2.patch new file mode 100644 index 0000000..1a13d4e --- /dev/null +++ b/patches/xar-ext2.patch @@ -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 ) diff --git a/tarballs/xar-1.5.2.tar.gz b/tarballs/xar-1.5.2.tar.gz deleted file mode 100644 index 419d57a..0000000 Binary files a/tarballs/xar-1.5.2.tar.gz and /dev/null differ diff --git a/tarballs/xar-1.6.1.tar.gz b/tarballs/xar-1.6.1.tar.gz new file mode 100644 index 0000000..8bace23 Binary files /dev/null and b/tarballs/xar-1.6.1.tar.gz differ