Mercurial > mxe-octave

changeset 2148:b005b9cf8998

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
many packages: use --build instead of wine cross_compiling hack
author Mark Brand <mabrand@mabrand.nl>
date Sat, 26 Nov 2011 16:30:36 +0100
parents 7a52fd32a10d
children bf5687570f1d
files src/curl.mk src/devil.mk src/exiv2.mk src/fltk.mk src/fontconfig.mk src/freetds.mk src/gdk-pixbuf.mk src/glib.mk src/glibmm.mk src/gsl.mk src/gsoap.mk src/gtkglext.mk src/gtkmm2.mk src/gtksourceviewmm2.mk src/ilmbase.mk src/imagemagick.mk src/lame.mk src/lcms.mk src/lcms1.mk src/libgcrypt.mk src/libgomp.mk src/libgpg_error.mk src/libgsasl.mk src/libidn.mk src/libntlm.mk src/libsamplerate.mk src/libsigc++.mk src/ogg.mk src/openexr.mk src/pangomm.mk src/pcre.mk src/theora.mk src/wxwidgets.mk src/xvidcore.mk
diffstat 34 files changed, 35 insertions(+), 74 deletions(-) [+]
line wrap: on
line diff
--- a/src/curl.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/curl.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,10 +20,9 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && ./buildconf
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-gnutls \
--- a/src/devil.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/devil.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -21,10 +21,9 @@
 
 define $(PKG)_BUILD
     $(SED) -i 's,__declspec(dllimport),,' '$(1)/include/IL/il.h'
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-ILU \
--- a/src/exiv2.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/exiv2.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,10 +20,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-visibility \
--- a/src/fltk.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/fltk.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -22,10 +22,9 @@
 define $(PKG)_BUILD
     cd '$(1)' && autoconf
     $(SED) -i 's,\$$uname,MINGW,g' '$(1)/configure'
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads \
--- a/src/fontconfig.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/fontconfig.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -22,11 +22,10 @@
     # ensure there is no (buggy) attempt to install the *.dll.a file
     # (remove this line of you want to link dynamically)
     $(SED) -i 's,^install-data-local:.*,install-data-local:,' '$(1)/src/Makefile.in'
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     $(SED) -i 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' '$(1)/fontconfig.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-arch='$(TARGET)' \
--- a/src/freetds.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/freetds.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -25,12 +25,10 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
-
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-rpath \
         --disable-dependency-tracking \
         --disable-shared \
--- a/src/gdk-pixbuf.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/gdk-pixbuf.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -21,10 +21,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-modules \
--- a/src/glib.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/glib.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -53,10 +53,9 @@
     $(INSTALL) -m755 '$(1).native/gio/glib-compile-schemas' '$(PREFIX)/$(TARGET)/bin/'
 
     # cross build
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-threads=win32 \
--- a/src/glibmm.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/glibmm.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,11 +20,9 @@
 endef
 
 define $(PKG)_BUILD
-    # cross build
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         CXX='$(TARGET)-c++' \
--- a/src/gsl.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/gsl.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,10 +20,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-shared \
         --enable-static
--- a/src/gsoap.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/gsoap.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -31,8 +31,6 @@
 
     $(MAKE) -C '$(1)' -j '$(JOBS)' clean
 
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     # fix hard-coded gnutls dependencies
     $(SED) -i "s/-lgnutls/`'$(TARGET)-pkg-config' --libs-only-l gnutls`/g;" '$(1)/configure'
 
@@ -42,6 +40,7 @@
     cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --enable-gnutls \
         CPPFLAGS='-DWITH_NTLM'
 
--- a/src/gtkglext.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/gtkglext.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -22,10 +22,9 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && autoconf
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-shared \
         --without-x \
--- a/src/gtkmm2.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/gtkmm2.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -22,10 +22,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         MAKE=$(MAKE)
--- a/src/gtksourceviewmm2.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/gtksourceviewmm2.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -22,10 +22,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-shared \
         MAKE=$(MAKE)
--- a/src/ilmbase.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/ilmbase.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,8 +20,6 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     # build the win32 thread sources instead of the posix thread sources
     $(SED) -i 's,IlmThreadPosix\.,IlmThreadWin32.,'                   '$(1)/IlmThread/Makefile.in'
     $(SED) -i 's,IlmThreadSemaphorePosix\.,IlmThreadSemaphoreWin32.,' '$(1)/IlmThread/Makefile.in'
@@ -31,6 +29,7 @@
     # threading. It will just disable the unwanted check for pthread.
     cd '$(1)' && $(SHELL) ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-threading \
--- a/src/imagemagick.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/imagemagick.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -19,10 +19,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-shared \
         --with-x=no \
--- a/src/lame.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/lame.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -19,10 +19,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-shared
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/lcms.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/lcms.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -19,11 +19,10 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --with-jpeg \
         --with-tiff \
--- a/src/lcms1.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/lcms1.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,11 +20,10 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --with-jpeg \
         --with-tiff \
--- a/src/libgcrypt.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/libgcrypt.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,10 +20,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-gpg-error-prefix='$(PREFIX)/$(TARGET)'
--- a/src/libgomp.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/libgomp.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -18,12 +18,10 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/libgomp/configure'
-
     mkdir -p '$(1)/build/$(TARGET)/libgomp'
     cd       '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --target='$(TARGET)' \
         --prefix='$(PREFIX)' \
         --enable-version-specific-runtime-libs \
--- a/src/libgpg_error.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/libgpg_error.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -19,10 +19,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-nls \
--- a/src/libgsasl.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/libgsasl.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,10 +20,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && touch src/libgsasl-7.def && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-nls \
--- a/src/libidn.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/libidn.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,10 +20,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --disable-csharp \
         --prefix='$(PREFIX)/$(TARGET)' \
--- a/src/libntlm.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/libntlm.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,10 +20,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libsamplerate.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/libsamplerate.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -21,10 +21,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    #$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libsigc++.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/libsigc++.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,11 +20,9 @@
 endef
 
 define $(PKG)_BUILD
-    # cross build
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         CXX='$(TARGET)-c++' \
--- a/src/ogg.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/ogg.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -19,10 +19,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/openexr.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/openexr.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -32,10 +32,9 @@
         CONFIG_SHELL=$(SHELL)
     $(MAKE) -C '$(1)/$(ilmbase_SUBDIR)' -j '$(JOBS)' install \
         bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-threading \
--- a/src/pangomm.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/pangomm.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,10 +20,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         MAKE=$(MAKE)
--- a/src/pcre.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/pcre.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -21,10 +21,9 @@
 define $(PKG)_BUILD
     $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcre.h.in'
     $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcreposix.h'
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-utf8 \
--- a/src/theora.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/theora.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -19,10 +19,9 @@
 endef
 
 define $(PKG)_BUILD
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_DATA=
--- a/src/wxwidgets.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/wxwidgets.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -21,10 +21,9 @@
 define $(PKG)_BUILD
     $(SED) -i 's,png_check_sig,png_sig_cmp,g'                       '$(1)/configure'
     $(SED) -i 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' '$(1)/configure'
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-compat24 \
@@ -70,10 +69,9 @@
     (cd '$(1)/$(wxwidgets_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
     $(SED) -i 's,png_check_sig,png_sig_cmp,g'                       '$(1)/$(wxwidgets_SUBDIR)/configure'
     $(SED) -i 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' '$(1)/$(wxwidgets_SUBDIR)/configure'
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/$(wxwidgets_SUBDIR)/configure'
     cd '$(1)/$(wxwidgets_SUBDIR)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-compat24 \
--- a/src/xvidcore.mk	Sat Nov 26 21:54:54 2011 +0100
+++ b/src/xvidcore.mk	Sat Nov 26 16:30:36 2011 +0100
@@ -20,10 +20,9 @@
 
 define $(PKG)_BUILD
     cd '$(1)' && autoconf
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build='$(BUILD)' \
         --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' BUILD_DIR='build' SHARED_LIB=
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/include'