Mercurial > mxe-octave
changeset 3013:bcc26ffe9a0f
use variable for --host and --build configure arguments
line wrap: on
line diff
--- a/Makefile Sun Jun 02 10:31:04 2013 -0400 +++ b/Makefile Sun Jun 02 12:40:32 2013 -0400 @@ -29,6 +29,7 @@ else TARGET := i686-pc-mingw32 endif +BUILD_SYSTEM := $(shell tools/config.guess) # Enable shared or static libs, or perhaps both. At least one # package uses --with instead of --enable. Probably it doesn't @@ -41,6 +42,11 @@ ## end of configuration variables. +ifneq ($(MXE_NATIVE_BUILD),yes) + HOST_AND_BUILD_CONFIGURE_OPTIONS := \ + --host='$(TARGET)' --build='$(BUILD_SYSTEM)' +endif + # These can't be chosen arbitrarily. The way things are configured now, # GCC expects to find cross-compiler include files in $(PREFIX)/$(TARGET). # and it's not clear to me how to change that.
--- a/src/agg.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/agg.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ $(SED) -i 's,aclocal,aclocal -I $(HOST_PREFIX)/share/aclocal,' '$(1)/autogen.sh' $(SED) -i 's,libtoolize,$(LIBTOOLIZE),' '$(1)/autogen.sh' cd '$(1)' && $(SHELL) ./autogen.sh \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --without-x
--- a/src/apr-util.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/apr-util.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --without-pgsql \ --without-sqlite2 \
--- a/src/apr.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/apr.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ ac_cv_sizeof_off_t=4 \ ac_cv_sizeof_pid_t=4 \
--- a/src/arpack.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/arpack.mk Sun Jun 02 12:40:32 2013 -0400 @@ -22,8 +22,7 @@ mkdir '$(1)/.build' cd '$(1)/.build' && '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --enable-static --disable-shared \ $($(PKG)_CONFIGURE_PIC_OPTION) \ --prefix='$(HOST_PREFIX)'
--- a/src/atk.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/atk.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-glibtest \
--- a/src/atkmm.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/atkmm.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ MAKE=$(MAKE)
--- a/src/aubio.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/aubio.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && autoconf cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --disable-jack \ --prefix='$(HOST_PREFIX)' \
--- a/src/bfd.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/bfd.mk Sun Jun 02 12:40:32 2013 -0400 @@ -16,7 +16,7 @@ define $(PKG)_BUILD cd '$(1)/bfd' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --target='$(TARGET)' \ --prefix='$(HOST_PREFIX)' \ --enable-install-libbfd \
--- a/src/binutils.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/binutils.mk Sun Jun 02 12:40:32 2013 -0400 @@ -29,7 +29,7 @@ cd '$(1)' && ./configure \ --target='$(TARGET)' \ - --build="`config.guess`" \ + --build='$(BUILD_SYSTEM)' \ --prefix='$(BUILD_TOOLS_PREFIX)' \ --with-gcc \ --with-gnu-ld \
--- a/src/cairo.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/cairo.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ $(SED) -i 's,libpng12,libpng,g' '$(1)/configure' $(SED) -i 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' '$(1)/src/cairo.pc.in' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-gtk-doc \
--- a/src/cairomm.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/cairomm.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ MAKE=$(MAKE)
--- a/src/cppunit.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/cppunit.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-doxygen \
--- a/src/cunit.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/cunit.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA=
--- a/src/curl.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/curl.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-gnutls \
--- a/src/dbus.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/dbus.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ --with-xml=expat \ --disable-tests \
--- a/src/dcmtk.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/dcmtk.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ --with-openssl \ --with-libtiff \
--- a/src/devil.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/devil.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD $(SED) -i 's,__declspec(dllimport),,' '$(1)/include/IL/il.h' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-ILU \
--- a/src/exiv2.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/exiv2.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-visibility \
--- a/src/expat.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/expat.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/faad2.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/faad2.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/fftw.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/fftw.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-threads \ @@ -29,8 +28,7 @@ $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-threads \ @@ -39,8 +37,7 @@ $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-threads \
--- a/src/file.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/file.mk Sun Jun 02 12:40:32 2013 -0400 @@ -27,8 +27,7 @@ $(MAKE) -C '$(1).native/src' -j '$(JOBS)' file cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= FILE_COMPILE='$(1).native/src/file'
--- a/src/flac.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/flac.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-doxygen-docs \
--- a/src/fltk.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/fltk.mk Sun Jun 02 12:40:32 2013 -0400 @@ -26,8 +26,7 @@ cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ DSOFLAGS='-L$(HOST_PREFIX)/lib' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-threads
--- a/src/fontconfig.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/fontconfig.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,8 +20,7 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ FREETYPE_CFLAGS='-I$(HOST_PREFIX)/include/freetype2' \ FREETYPE_LIBS='-lfreetype' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-arch='$(TARGET)' \
--- a/src/freeglut.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/freeglut.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./autogen.sh cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-replace-glut \
--- a/src/freetds.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/freetds.mk Sun Jun 02 12:40:32 2013 -0400 @@ -25,8 +25,7 @@ cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --disable-rpath \ --disable-dependency-tracking \ $(ENABLE_SHARED_OR_STATIC) \
--- a/src/freetype.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/freetype.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && GNUMAKE=$(MAKE) ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/fribidi.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/fribidi.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD $(SED) -i 's,__declspec(dllimport),,' '$(1)/lib/fribidi-common.h' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-debug \
--- a/src/ftgl.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/ftgl.mk Sun Jun 02 12:40:32 2013 -0400 @@ -21,7 +21,7 @@ cd '$(1)' && automake --gnu cd '$(1)' && autoconf cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --without-x \
--- a/src/gc.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gc.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --enable-threads=win32 \
--- a/src/gcc.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gcc.mk Sun Jun 02 12:40:32 2013 -0400 @@ -78,7 +78,7 @@ mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ --target='$(TARGET)' \ - --build="`config.guess`" \ + --build='$(BUILD_SYSTEM)' \ --prefix='$(BUILD_TOOLS_PREFIX)' \ --libdir='$(BUILD_TOOLS_PREFIX)/lib' \ --enable-languages='c,c++,fortran' \
--- a/src/gd.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gd.mk Sun Jun 02 12:40:32 2013 -0400 @@ -28,7 +28,7 @@ $(SED) -i 's,-lX11 ,,g' '$(1)/configure' $(SED) -i 's,png12,png15,g' '$(1)/configure' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-freetype='$(HOST_PREFIX)' \
--- a/src/gdal.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gdal.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD # The option '--without-threads' means native win32 threading without pthread. cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-bsb \
--- a/src/gdb.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gdb.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ CONFIG_SHELL=$(SHELL)
--- a/src/gdk-pixbuf.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gdk-pixbuf.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && autoreconf && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-modules \
--- a/src/geos.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/geos.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/gettext.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gettext.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)/gettext-runtime' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-threads=win32 \
--- a/src/giflib.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/giflib.mk Sun Jun 02 12:40:32 2013 -0400 @@ -21,8 +21,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ CPPFLAGS='-D_OPEN_BINARY'
--- a/src/glib.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/glib.mk Sun Jun 02 12:40:32 2013 -0400 @@ -69,8 +69,7 @@ $($(PKG)_NATIVE_BUILD)) # cross build cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-threads=win32 \
--- a/src/glibmm.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/glibmm.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ CXX='$(TARGET)-c++' \
--- a/src/glpk.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/glpk.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ mkdir '$(1)/.build' cd '$(1)/.build' && '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
--- a/src/gmp.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gmp.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,8 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && CC_FOR_BUILD=gcc ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --enable-cxx \
--- a/src/gnutls.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gnutls.mk Sun Jun 02 12:40:32 2013 -0400 @@ -26,8 +26,7 @@ # Value taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms737530%28v=vs.85%29.aspx cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-nls \
--- a/src/graphicsmagick.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/graphicsmagick.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ # This can be removed once the patch "graphicsmagick-1-fix-xml2-config.patch" is accepted by upstream cd '$(1)' && autoconf cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --without-modules \
--- a/src/gsl.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gsl.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/gsoap.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gsoap.mk Sun Jun 02 12:40:32 2013 -0400 @@ -40,8 +40,7 @@ # http://groups.google.com/group/ikarus-users/browse_thread/thread/fd1d101eac32633f cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --enable-gnutls \ CPPFLAGS='-DWITH_NTLM'
--- a/src/gst-plugins-base.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gst-plugins-base.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,8 +20,7 @@ -exec $(SED) -i 's,glib-mkenums,$(HOST_PREFIX)/bin/glib-mkenums,g' {} \; \ -exec $(SED) -i 's,glib-genmarshal,$(HOST_PREFIX)/bin/glib-genmarshal,g' {} \; cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \
--- a/src/gst-plugins-good.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gst-plugins-good.mk Sun Jun 02 12:40:32 2013 -0400 @@ -23,8 +23,7 @@ # http://www.videolan.org/developers/vlc/doc/doxygen/html/vlc__codecs_8h-source.html # http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2004-August/019283.html cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \
--- a/src/gstreamer.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gstreamer.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ $(SED) -i 's,glib-mkenums,$(HOST_PREFIX)/bin/glib-mkenums,g' '$(1)'/gst/Makefile.in $(SED) -i 's,glib-genmarshal,$(HOST_PREFIX)/bin/glib-genmarshal,g' '$(1)'/gst/Makefile.in cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \
--- a/src/gta.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gta.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --disable-reference \ --prefix='$(HOST_PREFIX)'
--- a/src/gtk2.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gtk2.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,8 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-explicit-deps \
--- a/src/gtkglarea.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gtkglarea.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && autoreconf -fi # to be removed if patch is integrated upstream cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/gtkglext.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gtkglext.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,8 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && autoconf cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --without-x \
--- a/src/gtkglextmm.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gtkglextmm.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install \
--- a/src/gtkmm2.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gtkmm2.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,8 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ MAKE=$(MAKE)
--- a/src/gtksourceview.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gtksourceview.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-gtk-doc \
--- a/src/gtksourceviewmm2.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/gtksourceviewmm2.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,8 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ MAKE=$(MAKE)
--- a/src/guile.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/guile.mk Sun Jun 02 12:40:32 2013 -0400 @@ -21,8 +21,7 @@ # won't try to use the "struct timespec" from <pthreads.h>, # which would fail because we tell Guile not to use Pthreads. cd '$(1)' && CC_FOR_BUILD=gcc ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --without-threads \
--- a/src/harfbuzz.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/harfbuzz.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/hdf5.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/hdf5.mk Sun Jun 02 12:40:32 2013 -0400 @@ -44,8 +44,7 @@ mkdir '$(1)/.build' cd '$(1)/.build' && '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-direct-vfd \
--- a/src/hunspell.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/hunspell.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD # Note: the configure file doesn't pick up pdcurses, so "ui" is disabled cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --with-warnings \ --without-ui \
--- a/src/id3lib.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/id3lib.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && autoconf cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/ilmbase.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/ilmbase.mk Sun Jun 02 12:40:32 2013 -0400 @@ -25,8 +25,7 @@ # Because of the previous changes, '--disable-threading' will not disable # threading. It will just disable the unwanted check for pthread. cd '$(1)' && $(SHELL) ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-threading \
--- a/src/imagemagick.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/imagemagick.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --with-x=no \
--- a/src/jasper.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/jasper.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && autoreconf && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-libjpeg \
--- a/src/jpeg.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/jpeg.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= endef
--- a/src/json-c.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/json-c.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,9 +18,8 @@ define $(PKG)_BUILD cd '$(1)' && ./autogen.sh cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ - --build="`config.guess`"\ $(ENABLE_SHARED_OR_STATIC) CFLAGS=-Wno-error $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/lame.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/lame.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/lcms.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/lcms.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --with-jpeg \ --with-tiff \
--- a/src/lcms1.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/lcms1.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --with-jpeg \ --with-tiff \
--- a/src/libarchive.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libarchive.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ $(SED) -i '1i#ifndef LIBARCHIVE_STATIC\n#define LIBARCHIVE_STATIC\n#endif' -i '$(1)/libarchive/archive.h' $(SED) -i '1i#ifndef LIBARCHIVE_STATIC\n#define LIBARCHIVE_STATIC\n#endif' -i '$(1)/libarchive/archive_entry.h' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-bsdtar \
--- a/src/libass.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libass.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-enca \
--- a/src/libcroco.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libcroco.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-gtk-doc
--- a/src/libdnet.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libdnet.mk Sun Jun 02 12:40:32 2013 -0400 @@ -27,7 +27,7 @@ $(SED) -i 's,#include <Ntddndis.h>,#include <ddk/ntddndis.h>,' '$(1)/src/eth-win32.c' $(SED) -i 's,-mno-cygwin,,' '$(1)/configure' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libevent.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libevent.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA=
--- a/src/libffi.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libffi.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)/$(TARGET)' -j '$(JOBS)'
--- a/src/libgcrypt.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libgcrypt.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && autoreconf && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libgda.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libgda.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,7 +20,7 @@ $(SED) -i 's,glib-mkenums,'$(HOST_PREFIX)/bin/glib-mkenums',g' '$(1)/libgda/sql-parser/Makefile.in' $(SED) -i 's,glib-mkenums,'$(HOST_PREFIX)/bin/glib-mkenums',g' '$(1)/libgda-ui/Makefile.in' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-gtk-doc \
--- a/src/libgdamm.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libgdamm.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ CXX='$(TARGET)-c++' \
--- a/src/libgee.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libgee.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libgeotiff.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libgeotiff.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,7 +20,7 @@ $(SED) -i 's,/usr/local,@prefix@,' '$(1)/bin/Makefile.in' touch '$(1)/configure' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4` -ljpeg -lz"
--- a/src/libglade.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libglade.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config'
--- a/src/libgnurx.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libgnurx.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,7 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -f Makefile.mxe -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -f Makefile.mxe -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= install install-static
--- a/src/libgomp.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libgomp.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD mkdir -p '$(1)/build/$(TARGET)/libgomp' cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --target='$(TARGET)' \ --prefix='$(BUILD_TOOLS_PREFIX)' \ --enable-version-specific-runtime-libs \
--- a/src/libgpg_error.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libgpg_error.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-nls \
--- a/src/libgsasl.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libgsasl.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && touch src/libgsasl-7.def && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-nls \
--- a/src/libgsf.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libgsf.mk Sun Jun 02 12:40:32 2013 -0400 @@ -21,8 +21,7 @@ $(SED) -i 's,^\(Requires:.*\),\1 gio-2.0,' '$(1)'/libgsf-1.pc.in echo 'Libs.private: -lz -lbz2' >> '$(1)'/libgsf-1.pc.in cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-nls \
--- a/src/libharu.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libharu.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --with-zlib='$(HOST_PREFIX)' \
--- a/src/libiberty.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libiberty.mk Sun Jun 02 12:40:32 2013 -0400 @@ -16,7 +16,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-install-libiberty
--- a/src/libiconv.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libiconv.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD $(SED) -i 's, sed , $(SED) ,g' '$(1)/windows/windres-options' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ CPPFLAGS='$(MXE_CPPFLAGS)' \
--- a/src/libidn.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libidn.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --disable-csharp \ --prefix='$(HOST_PREFIX)' \
--- a/src/libircclient.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libircclient.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --disable-debug \ --enable-threads \ --disable-ipv6
--- a/src/liblo.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/liblo.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libmad.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libmad.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD $(SED) -i '/-fforce-mem/d' '$(1)'/configure cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/libmng.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libmng.mk Sun Jun 02 12:40:32 2013 -0400 @@ -22,8 +22,7 @@ mkdir '$(1)/.build' cd '$(1)/.build' && '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ --enable-shared $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
--- a/src/libmodplug.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libmodplug.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/libntlm.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libntlm.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/liboauth.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/liboauth.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-curl
--- a/src/libodbc++.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libodbc++.mk Sun Jun 02 12:40:32 2013 -0400 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --without-tests \ --disable-dependency-tracking
--- a/src/liboil.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/liboil.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \
--- a/src/libpano13.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libpano13.mk Sun Jun 02 12:40:32 2013 -0400 @@ -24,7 +24,7 @@ $(SED) -i 's,mv.*libpano13\.dll.*,,' '$(1)/Makefile.in' cd '$(1)' && ./configure \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --with-jpeg='$(HOST_PREFIX)'/lib \ --with-tiff='$(HOST_PREFIX)'/lib \
--- a/src/libpaper.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libpaper.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libpng.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libpng.mk Sun Jun 02 12:40:32 2013 -0400 @@ -24,8 +24,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/librsvg.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/librsvg.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-pixbuf-loader \
--- a/src/libsamplerate.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libsamplerate.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libshout.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libshout.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-thread \
--- a/src/libsigc++.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libsigc++.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ CXX='$(TARGET)-c++' \
--- a/src/libsndfile.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libsndfile.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-sqlite \
--- a/src/libssh2.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libssh2.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && ./buildconf cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --without-openssl \
--- a/src/libtool.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libtool.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)/libltdl' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --enable-ltdl-install
--- a/src/libunistring.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libunistring.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --enable-threads=win32
--- a/src/libxml++.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libxml++.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && CXX="$(TARGET)-g++ -mthreads" ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ MAKE=$(MAKE)
--- a/src/libxml2.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libxml2.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,8 +20,7 @@ $(SED) -i 's,`uname`,MinGW,g' '$(1)/xml2-config.in' cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --without-debug \ --prefix='$(HOST_PREFIX)' \
--- a/src/libxslt.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/libxslt.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --without-debug \ --prefix='$(HOST_PREFIX)' \
--- a/src/log4cxx.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/log4cxx.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --with-apr='$(HOST_PREFIX)' \ --with-apr-util='$(HOST_PREFIX)' \
--- a/src/lzo.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/lzo.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/matio.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/matio.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-test \
--- a/src/mdbtools.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/mdbtools.mk Sun Jun 02 12:40:32 2013 -0400 @@ -21,8 +21,7 @@ '$(SED)' -i 's/libtooloze/libtoolize/g;' '$(1)/autogen.sh' cd '$(1)' && NOCONFIGURE=1 ./autogen.sh cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config'
--- a/src/mingw-utils.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/mingw-utils.mk Sun Jun 02 12:40:32 2013 -0400 @@ -26,7 +26,7 @@ # cross build cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/mpfr.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/mpfr.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-threads=win32 \
--- a/src/muparser.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/muparser.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-samples \
--- a/src/mxml.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/mxml.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-threads
--- a/src/native-binutils.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/native-binutils.mk Sun Jun 02 12:40:32 2013 -0400 @@ -28,8 +28,7 @@ cd '$(1)' && ./configure \ --target='$(TARGET)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='/usr' \ --with-gcc \ --with-gnu-ld \
--- a/src/native-gcc.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/native-gcc.mk Sun Jun 02 12:40:32 2013 -0400 @@ -33,8 +33,7 @@ mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ --target='$(TARGET)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='/usr' \ --libdir='/usr/lib' \ --enable-languages='c,c++,objc,fortran' \
--- a/src/ncurses.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/ncurses.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix=$(HOST_PREFIX) \ --disable-home-terminfo \ --enable-sp-funcs \
--- a/src/nettle.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/nettle.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o
--- a/src/octave.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/octave.mk Sun Jun 02 12:40:32 2013 -0400 @@ -30,8 +30,7 @@ cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) \ LDFLAGS='-Wl,-rpath-link,$(MXE_LIBDIR) -L$(MXE_LIBDIR)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $($(PKG)_CROSS_CONFIG_OPTIONS)
--- a/src/ogg.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/ogg.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/opencore-amr.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/opencore-amr.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/openexr.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/openexr.mk Sun Jun 02 12:40:32 2013 -0400 @@ -23,7 +23,7 @@ (cd '$(1)/$(ilmbase_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) echo 'echo $1' > '$(1)/$(ilmbase_SUBDIR)/config.sub' cd '$(1)/$(ilmbase_SUBDIR)' && $(SHELL) ./configure \ - --build="`config.guess`" \ + --build='$(BUILD_SYSTEM)' \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(1)/ilmbase' \ --enable-threading=no \ @@ -32,8 +32,7 @@ $(MAKE) -C '$(1)/$(ilmbase_SUBDIR)' -j '$(JOBS)' install \ bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-threading \
--- a/src/pango.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/pango.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,8 +20,7 @@ rm '$(1)'/docs/Makefile.am cd '$(1)' && NOCONFIGURE=1 ./autogen.sh cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-gtk-doc \
--- a/src/pangomm.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/pangomm.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ MAKE=$(MAKE)
--- a/src/pcre.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/pcre.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,8 +20,7 @@ $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcre.h.in' $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcreposix.h' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-pcre16 \
--- a/src/pdflib_lite.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/pdflib_lite.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ cd '$(1)' && aclocal -I config --install cd '$(1)' && autoconf cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --without-openssl \
--- a/src/pfstools.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/pfstools.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-netpbm \
--- a/src/pixman.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/pixman.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/plibc.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/plibc.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD chmod 0755 '$(1)/configure' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/plotmm.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/plotmm.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install \
--- a/src/plotutils.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/plotutils.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,7 +20,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --enable-libplotter \ --enable-libxmi \
--- a/src/poppler.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/poppler.mk Sun Jun 02 12:40:32 2013 -0400 @@ -21,8 +21,7 @@ # because libtiff is not found, but because some references are # undefined) cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ --disable-silent-rules \ $(ENABLE_SHARED_OR_STATIC) \
--- a/src/popt.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/popt.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-nls
--- a/src/portaudio.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/portaudio.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && autoconf cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-host_os=mingw \
--- a/src/postgresql.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/postgresql.mk Sun Jun 02 12:40:32 2013 -0400 @@ -33,8 +33,7 @@ cd '$(1)' && ./configure \ $($(PKG)_CONFIGURE_FLAGS_OPTION) \ --prefix='$(HOST_PREFIX)' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --enable-shared \ --disable-rpath \ --without-tcl \
--- a/src/proj.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/proj.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-mutex
--- a/src/protobuf.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/protobuf.mk Sun Jun 02 12:40:32 2013 -0400 @@ -24,7 +24,7 @@ $(MAKE) -C '$(1)' -j 1 distclean # Second step: Build for target system. cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --with-zlib \
--- a/src/pstoedit.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/pstoedit.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ cd '$(1)' && autoreconf mkdir '$(1)/.build' cd '$(1)/.build' && '$(1)/configure' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
--- a/src/qdbm.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/qdbm.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ --enable-lzo \ --enable-bzip \
--- a/src/qhull.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/qhull.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ mkdir '$(1)/.build' cd '$(1)/.build' && '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
--- a/src/qrupdate.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/qrupdate.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,8 +20,7 @@ cd '$(1)' && autoreconf -W none chmod a+rx '$(1)/configure' cd '$(1)/.build' && '$(1)/configure' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
--- a/src/readline.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/readline.mk Sun Jun 02 12:40:32 2013 -0400 @@ -32,7 +32,7 @@ $(SED) -i 's,^ *case SIGTSTP:.*,,' '$(1)/signals.c' cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-multibyte \
--- a/src/sdl.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/sdl.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ $(SED) -i 's,-mwindows,-lwinmm -mwindows,' '$(1)/configure' cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-threads \
--- a/src/sdl_image.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/sdl_image.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD $(SED) -i 's,^\(Requires:.*\),\1 libtiff-4 libpng,' '$(1)/SDL_image.pc.in' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-sdl-prefix='$(HOST_PREFIX)' \
--- a/src/sdl_mixer.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/sdl_mixer.mk Sun Jun 02 12:40:32 2013 -0400 @@ -24,7 +24,7 @@ >> '$(1)/SDL_mixer.pc.in' $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-sdl-prefix='$(HOST_PREFIX)' \
--- a/src/sdl_net.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/sdl_net.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-sdl-prefix='$(HOST_PREFIX)' \
--- a/src/sdl_pango.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/sdl_pango.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ $(SED) -i 's,\r$$,,' '$(1)/SDL_Pango.pc.in' $(SED) -i 's,^\(Requires:.*\),\1 pangoft2,' '$(1)/SDL_Pango.pc.in' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-sdl-prefix='$(HOST_PREFIX)' \
--- a/src/sdl_sound.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/sdl_sound.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-sdl-prefix='$(HOST_PREFIX)' \
--- a/src/sdl_ttf.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/sdl_ttf.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-sdl-prefix='$(HOST_PREFIX)' \
--- a/src/smpeg.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/smpeg.mk Sun Jun 02 12:40:32 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ AR='$(TARGET)-ar' \ NM='$(TARGET)-nm' \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --prefix='$(HOST_PREFIX)' \
--- a/src/sox.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/sox.mk Sun Jun 02 12:40:32 2013 -0400 @@ -24,9 +24,8 @@ $(SED) 's, sox_LDADD += ,,g' | tr -d '\n'` >>'$(1)/sox.pc.in' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ - --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= EXTRA_PROGRAMS=
--- a/src/speex.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/speex.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-oggtest
--- a/src/sqlite.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/sqlite.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-readline \
--- a/src/stable-octave.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/stable-octave.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD mkdir '$(1)/.build' cd '$(1)/.build' && '$(1)/configure' \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ FLTK_CONFIG="$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-fltk-config" \ gl_cv_func_gettimeofday_clobber=no
--- a/src/t4k_common.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/t4k_common.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --with-sdlpango \
--- a/src/termcap.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/termcap.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ cd '$(1)' && autoreconf cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ AR=$(TARGET)-ar
--- a/src/texinfo.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/texinfo.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ mkdir '$(1)/.build' cd '$(1)/.build' && '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' ## All we need for Octave is makeinfo.
--- a/src/theora.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/theora.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_DATA=
--- a/src/tiff.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/tiff.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --without-x
--- a/src/tre.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/tre.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-nls
--- a/src/vorbis.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/vorbis.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ PKG_CONFIG='$(TARGET)-pkg-config'
--- a/src/wget.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/wget.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ $(SED) -i 's/^base64_encode /wget_base64_encode /;' '$(1)/src/utils.c' $(SED) -i 's/-lidn/`i686-pc-mingw32-pkg-config --libs libidn`/g;' '$(1)/configure' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ --with-ssl=gnutls $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/wxwidgets.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/wxwidgets.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,8 +19,7 @@ $(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' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-compat24 \ @@ -68,8 +67,7 @@ $(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' cd '$(1)/$(wxwidgets_SUBDIR)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-compat24 \
--- a/src/x264.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/x264.mk Sun Jun 02 12:40:32 2013 -0400 @@ -16,7 +16,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --cross-prefix='$(TARGET)'- \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --enable-win32thread
--- a/src/xapian-core.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/xapian-core.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATC) $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/xerces.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/xerces.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && CONFIG_SHELL='$(SHELL)' ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --disable-sse2 \ --prefix='$(HOST_PREFIX)' \
--- a/src/xine-lib.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/xine-lib.mk Sun Jun 02 12:40:32 2013 -0400 @@ -23,7 +23,7 @@ cd '$(1)' && autoconf cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-mmap \
--- a/src/xmlwrapp.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/xmlwrapp.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ PKG_CONFIG='$(TARGET)-pkg-config'
--- a/src/xvidcore.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/xvidcore.mk Sun Jun 02 12:40:32 2013 -0400 @@ -18,8 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && autoconf cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' BUILD_DIR='build' SHARED_LIB= $(INSTALL) -d '$(HOST_PREFIX)/include'
--- a/src/xz.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/xz.mk Sun Jun 02 12:40:32 2013 -0400 @@ -17,8 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-threads \
--- a/src/zziplib.mk Sun Jun 02 10:31:04 2013 -0400 +++ b/src/zziplib.mk Sun Jun 02 12:40:32 2013 -0400 @@ -19,7 +19,7 @@ # don't build and install docs (echo '# DISABLED'; echo 'all:'; echo 'install:') > '$(1)/docs/Makefile.in' cd '$(1)' && ./configure \ - --host='$(TARGET)' \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --disable-mmap \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \