diff --git a/ports/xz/xz.patch b/ports/xz/xz.patch index d102249a..f198c652 100644 --- a/ports/xz/xz.patch +++ b/ports/xz/xz.patch @@ -1,60 +1,24 @@ diff -Paur --no-dereference -- xz.upstream/configure xz/configure --- xz.upstream/configure +++ xz/configure -@@ -16829,7 +16829,7 @@ - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then -- INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" -+ INCICONV="${INCICONV}${INCICONV:+ }" - fi - fi - fi -@@ -16876,7 +16876,7 @@ - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then -- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" -+ LIBICONV="${LIBICONV}${LIBICONV:+ }" - fi - fi - haveit= -@@ -16897,7 +16897,7 @@ - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then -- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" -+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }" - fi - fi - fi -@@ -17772,7 +17772,7 @@ - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then -- INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" -+ INCINTL="${INCINTL}${INCINTL:+ }" - fi - fi - fi -@@ -17819,7 +17819,7 @@ - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then -- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" -+ LIBINTL="${LIBINTL}${LIBINTL:+ }" - fi - fi - haveit= -@@ -17840,7 +17840,7 @@ - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then -- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" -+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }" - fi - fi - fi +@@ -16527,7 +16527,7 @@ + + + +- use_additional=yes ++ use_additional=no + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" +@@ -17470,7 +17470,7 @@ + + + +- use_additional=yes ++ use_additional=no + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" @@ -19269,6 +19269,7 @@ #if defined(_WIN32) || defined(__CYGWIN__) || defined(__OS2__) \