Mercurial > hg > mxe-octave-anirudha
changeset 2148:b005b9cf8998
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 +++ b/src/curl.mk @@ -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 +++ b/src/devil.mk @@ -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 +++ b/src/exiv2.mk @@ -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 +++ b/src/fltk.mk @@ -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 +++ b/src/fontconfig.mk @@ -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 +++ b/src/freetds.mk @@ -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 +++ b/src/gdk-pixbuf.mk @@ -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 +++ b/src/glib.mk @@ -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 +++ b/src/glibmm.mk @@ -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 +++ b/src/gsl.mk @@ -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 +++ b/src/gsoap.mk @@ -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 +++ b/src/gtkglext.mk @@ -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 +++ b/src/gtkmm2.mk @@ -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 +++ b/src/gtksourceviewmm2.mk @@ -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 +++ b/src/ilmbase.mk @@ -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 +++ b/src/imagemagick.mk @@ -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 +++ b/src/lame.mk @@ -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 +++ b/src/lcms.mk @@ -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 +++ b/src/lcms1.mk @@ -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 +++ b/src/libgcrypt.mk @@ -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 +++ b/src/libgomp.mk @@ -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 +++ b/src/libgpg_error.mk @@ -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 +++ b/src/libgsasl.mk @@ -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 +++ b/src/libidn.mk @@ -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 +++ b/src/libntlm.mk @@ -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 +++ b/src/libsamplerate.mk @@ -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 +++ b/src/libsigc++.mk @@ -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 +++ b/src/ogg.mk @@ -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 +++ b/src/openexr.mk @@ -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 +++ b/src/pangomm.mk @@ -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 +++ b/src/pcre.mk @@ -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 +++ b/src/theora.mk @@ -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 +++ b/src/wxwidgets.mk @@ -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 +++ b/src/xvidcore.mk @@ -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'