From 3cce3e9b58dda736fbedbecc9e8449ce65b9f64c Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 26 Nov 2011 16:30:36 +0100 Subject: many packages: use --build instead of wine cross_compiling hack --- src/curl.mk | 3 +-- src/devil.mk | 3 +-- src/exiv2.mk | 3 +-- src/fltk.mk | 3 +-- src/fontconfig.mk | 3 +-- src/freetds.mk | 4 +--- src/gdk-pixbuf.mk | 3 +-- src/glib.mk | 3 +-- src/glibmm.mk | 4 +--- src/gsl.mk | 3 +-- src/gsoap.mk | 3 +-- src/gtkglext.mk | 3 +-- src/gtkmm2.mk | 3 +-- src/gtksourceviewmm2.mk | 3 +-- src/ilmbase.mk | 3 +-- src/imagemagick.mk | 3 +-- src/lame.mk | 3 +-- src/lcms.mk | 3 +-- src/lcms1.mk | 3 +-- src/libgcrypt.mk | 3 +-- src/libgomp.mk | 4 +--- src/libgpg_error.mk | 3 +-- src/libgsasl.mk | 3 +-- src/libidn.mk | 3 +-- src/libntlm.mk | 3 +-- src/libsamplerate.mk | 3 +-- src/libsigc++.mk | 4 +--- src/ogg.mk | 3 +-- src/openexr.mk | 3 +-- src/pangomm.mk | 3 +-- src/pcre.mk | 3 +-- src/theora.mk | 3 +-- src/wxwidgets.mk | 6 ++---- src/xvidcore.mk | 3 +-- 34 files changed, 35 insertions(+), 74 deletions(-) diff --git a/src/curl.mk b/src/curl.mk index fa1ad7e..2089606 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -20,10 +20,9 @@ endef 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 --git a/src/devil.mk b/src/devil.mk index 8b89fa0..4f9d83e 100644 --- a/src/devil.mk +++ b/src/devil.mk @@ -21,10 +21,9 @@ endef 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 --git a/src/exiv2.mk b/src/exiv2.mk index 6fc3af2..654a4da 100644 --- a/src/exiv2.mk +++ b/src/exiv2.mk @@ -20,10 +20,9 @@ define $(PKG)_UPDATE 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 --git a/src/fltk.mk b/src/fltk.mk index 631f2a9..28741bb 100644 --- a/src/fltk.mk +++ b/src/fltk.mk @@ -22,10 +22,9 @@ endef 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 --git a/src/fontconfig.mk b/src/fontconfig.mk index 2df4a8b..ba7a71f 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -22,11 +22,10 @@ define $(PKG)_BUILD # 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 --git a/src/freetds.mk b/src/freetds.mk index 5c420f8..27216d1 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -25,12 +25,10 @@ define $(PKG)_UPDATE_orig 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 --git a/src/gdk-pixbuf.mk b/src/gdk-pixbuf.mk index 729fc7e..8e5d5a6 100644 --- a/src/gdk-pixbuf.mk +++ b/src/gdk-pixbuf.mk @@ -21,10 +21,9 @@ define $(PKG)_UPDATE 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 --git a/src/glib.mk b/src/glib.mk index d336148..f598af8 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -53,10 +53,9 @@ define $(PKG)_BUILD $(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 --git a/src/glibmm.mk b/src/glibmm.mk index fa2d315..6362c5d 100644 --- a/src/glibmm.mk +++ b/src/glibmm.mk @@ -20,11 +20,9 @@ define $(PKG)_UPDATE 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 --git a/src/gsl.mk b/src/gsl.mk index ad43926..2dac966 100644 --- a/src/gsl.mk +++ b/src/gsl.mk @@ -20,10 +20,9 @@ define $(PKG)_UPDATE 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 --git a/src/gsoap.mk b/src/gsoap.mk index 02e9314..e3f550c 100644 --- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -31,8 +31,6 @@ define $(PKG)_BUILD $(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 @@ define $(PKG)_BUILD cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ + --build='$(BUILD)' \ --enable-gnutls \ CPPFLAGS='-DWITH_NTLM' diff --git a/src/gtkglext.mk b/src/gtkglext.mk index 9260d42..8540c15 100644 --- a/src/gtkglext.mk +++ b/src/gtkglext.mk @@ -22,10 +22,9 @@ endef 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 --git a/src/gtkmm2.mk b/src/gtkmm2.mk index 7e7bf3a..205c3a4 100644 --- a/src/gtkmm2.mk +++ b/src/gtkmm2.mk @@ -22,10 +22,9 @@ define $(PKG)_UPDATE 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 --git a/src/gtksourceviewmm2.mk b/src/gtksourceviewmm2.mk index 44c43c4..8d14c5a 100644 --- a/src/gtksourceviewmm2.mk +++ b/src/gtksourceviewmm2.mk @@ -22,10 +22,9 @@ define $(PKG)_UPDATE 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 --git a/src/ilmbase.mk b/src/ilmbase.mk index 1747b9e..9d698e5 100644 --- a/src/ilmbase.mk +++ b/src/ilmbase.mk @@ -20,8 +20,6 @@ define $(PKG)_UPDATE 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 @@ define $(PKG)_BUILD # 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 --git a/src/imagemagick.mk b/src/imagemagick.mk index 9fedfad..b224bc1 100644 --- a/src/imagemagick.mk +++ b/src/imagemagick.mk @@ -19,10 +19,9 @@ define $(PKG)_UPDATE 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 --git a/src/lame.mk b/src/lame.mk index 1498444..2a70e14 100644 --- a/src/lame.mk +++ b/src/lame.mk @@ -19,10 +19,9 @@ define $(PKG)_UPDATE 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 --git a/src/lcms.mk b/src/lcms.mk index cd2b003..7503c11 100644 --- a/src/lcms.mk +++ b/src/lcms.mk @@ -19,11 +19,10 @@ define $(PKG)_UPDATE 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 --git a/src/lcms1.mk b/src/lcms1.mk index 74c097a..5edd5e8 100644 --- a/src/lcms1.mk +++ b/src/lcms1.mk @@ -20,11 +20,10 @@ define $(PKG)_UPDATE 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 --git a/src/libgcrypt.mk b/src/libgcrypt.mk index 7e1d2bc..95644ff 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -20,10 +20,9 @@ define $(PKG)_UPDATE 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 --git a/src/libgomp.mk b/src/libgomp.mk index 7abdcab..19aa137 100644 --- a/src/libgomp.mk +++ b/src/libgomp.mk @@ -18,12 +18,10 @@ define $(PKG)_UPDATE 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 --git a/src/libgpg_error.mk b/src/libgpg_error.mk index cdb2517..76f1775 100644 --- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -19,10 +19,9 @@ define $(PKG)_UPDATE 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 --git a/src/libgsasl.mk b/src/libgsasl.mk index 8408ef2..d24b004 100644 --- a/src/libgsasl.mk +++ b/src/libgsasl.mk @@ -20,10 +20,9 @@ define $(PKG)_UPDATE 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 --git a/src/libidn.mk b/src/libidn.mk index 4b0aa93..ca9ed56 100644 --- a/src/libidn.mk +++ b/src/libidn.mk @@ -20,10 +20,9 @@ define $(PKG)_UPDATE 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 --git a/src/libntlm.mk b/src/libntlm.mk index 03b60f9..ff0ff77 100644 --- a/src/libntlm.mk +++ b/src/libntlm.mk @@ -20,10 +20,9 @@ define $(PKG)_UPDATE 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 --git a/src/libsamplerate.mk b/src/libsamplerate.mk index 643d932..9aa67ea 100644 --- a/src/libsamplerate.mk +++ b/src/libsamplerate.mk @@ -21,10 +21,9 @@ define $(PKG)_UPDATE 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 --git a/src/libsigc++.mk b/src/libsigc++.mk index dd78851..88d2263 100644 --- a/src/libsigc++.mk +++ b/src/libsigc++.mk @@ -20,11 +20,9 @@ define $(PKG)_UPDATE 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 --git a/src/ogg.mk b/src/ogg.mk index 20d392a..a2de998 100644 --- a/src/ogg.mk +++ b/src/ogg.mk @@ -19,10 +19,9 @@ define $(PKG)_UPDATE 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 --git a/src/openexr.mk b/src/openexr.mk index f4b57fd..91e3cc7 100644 --- a/src/openexr.mk +++ b/src/openexr.mk @@ -32,10 +32,9 @@ define $(PKG)_BUILD 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 --git a/src/pangomm.mk b/src/pangomm.mk index 1ee8b2b..ba762b8 100644 --- a/src/pangomm.mk +++ b/src/pangomm.mk @@ -20,10 +20,9 @@ define $(PKG)_UPDATE 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 --git a/src/pcre.mk b/src/pcre.mk index b8216d6..8ae72d2 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -21,10 +21,9 @@ endef 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 --git a/src/theora.mk b/src/theora.mk index 0505dac..f40eeca 100644 --- a/src/theora.mk +++ b/src/theora.mk @@ -19,10 +19,9 @@ define $(PKG)_UPDATE 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 --git a/src/wxwidgets.mk b/src/wxwidgets.mk index d4068de..bdb1103 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -21,10 +21,9 @@ endef 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 @@ define $(PKG)_BUILD (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 --git a/src/xvidcore.mk b/src/xvidcore.mk index d45bfa4..f338d8b 100644 --- a/src/xvidcore.mk +++ b/src/xvidcore.mk @@ -20,10 +20,9 @@ endef 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' -- cgit v0.12