# HG changeset patch # User Mark Brand # Date 1322321436 -3600 # Node ID b005b9cf89987fb21d1e6f431a92f3e464251692 # Parent 7a52fd32a10d1709a43f5646f8d9d52294cf6ae6 many packages: use --build instead of wine cross_compiling hack diff -r 7a52fd32a10d -r b005b9cf8998 src/curl.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/devil.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/exiv2.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/fltk.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/fontconfig.mk --- 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)' \ diff -r 7a52fd32a10d -r b005b9cf8998 src/freetds.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/gdk-pixbuf.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/glib.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/glibmm.mk --- 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++' \ diff -r 7a52fd32a10d -r b005b9cf8998 src/gsl.mk --- 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 diff -r 7a52fd32a10d -r b005b9cf8998 src/gsoap.mk --- 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' diff -r 7a52fd32a10d -r b005b9cf8998 src/gtkglext.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/gtkmm2.mk --- 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) diff -r 7a52fd32a10d -r b005b9cf8998 src/gtksourceviewmm2.mk --- 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) diff -r 7a52fd32a10d -r b005b9cf8998 src/ilmbase.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/imagemagick.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/lame.mk --- 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)' diff -r 7a52fd32a10d -r b005b9cf8998 src/lcms.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/lcms1.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/libgcrypt.mk --- 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)' diff -r 7a52fd32a10d -r b005b9cf8998 src/libgomp.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/libgpg_error.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/libgsasl.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/libidn.mk --- 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)' \ diff -r 7a52fd32a10d -r b005b9cf8998 src/libntlm.mk --- 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= diff -r 7a52fd32a10d -r b005b9cf8998 src/libsamplerate.mk --- 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= diff -r 7a52fd32a10d -r b005b9cf8998 src/libsigc++.mk --- 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++' \ diff -r 7a52fd32a10d -r b005b9cf8998 src/ogg.mk --- 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= diff -r 7a52fd32a10d -r b005b9cf8998 src/openexr.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/pangomm.mk --- 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) diff -r 7a52fd32a10d -r b005b9cf8998 src/pcre.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/theora.mk --- 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= diff -r 7a52fd32a10d -r b005b9cf8998 src/wxwidgets.mk --- 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 \ diff -r 7a52fd32a10d -r b005b9cf8998 src/xvidcore.mk --- 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'