Fix native cross issue in xz.
This commit is contained in:
parent
8a4548db7d
commit
4e0ed30861
|
@ -1,60 +1,24 @@
|
||||||
diff -Paur --no-dereference -- xz.upstream/configure xz/configure
|
diff -Paur --no-dereference -- xz.upstream/configure xz/configure
|
||||||
--- xz.upstream/configure
|
--- xz.upstream/configure
|
||||||
+++ xz/configure
|
+++ xz/configure
|
||||||
@@ -16829,7 +16829,7 @@
|
@@ -16527,7 +16527,7 @@
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_includedir"; then
|
|
||||||
- INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
|
- use_additional=yes
|
||||||
+ INCICONV="${INCICONV}${INCICONV:+ }"
|
+ use_additional=no
|
||||||
fi
|
|
||||||
fi
|
acl_save_prefix="$prefix"
|
||||||
fi
|
prefix="$acl_final_prefix"
|
||||||
@@ -16876,7 +16876,7 @@
|
@@ -17470,7 +17470,7 @@
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_libdir"; then
|
|
||||||
- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
|
- use_additional=yes
|
||||||
+ LIBICONV="${LIBICONV}${LIBICONV:+ }"
|
+ use_additional=no
|
||||||
fi
|
|
||||||
fi
|
acl_save_prefix="$prefix"
|
||||||
haveit=
|
prefix="$acl_final_prefix"
|
||||||
@@ -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
|
|
||||||
@@ -19269,6 +19269,7 @@
|
@@ -19269,6 +19269,7 @@
|
||||||
|
|
||||||
#if defined(_WIN32) || defined(__CYGWIN__) || defined(__OS2__) \
|
#if defined(_WIN32) || defined(__CYGWIN__) || defined(__OS2__) \
|
||||||
|
|
Loading…
Reference in New Issue