Mercurial > hg > mxe-octave-anirudha
changeset 2153:e4c83fa61a5b
replaced $(BUILD) with a more direct and less brittle construct
For discussion, see the following email and its follow-ups:
http://lists.nongnu.org/archive/html/mingw-cross-env-list/2011-11/msg00112.html
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Mon, 28 Nov 2011 09:51:56 +0100 |
parents | 63eeef8e03e9 |
children | 58ea60dca393 |
files | Makefile src/agg.mk src/binutils.mk src/curl.mk src/devil.mk src/exiv2.mk src/fltk.mk src/fontconfig.mk src/freetds.mk src/gcc.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/guile.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 | 39 files changed, 38 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile +++ b/Makefile @@ -16,7 +16,6 @@ TOP_DIR := $(patsubst %/,%,$(dir $(MAKEFILE))) PATH := $(PREFIX)/bin:$(PATH) SHELL := bash -BUILD := $(shell config.guess 2>/dev/null) INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install LIBTOOL := $(shell glibtool --help >/dev/null 2>&1 && echo g)libtool LIBTOOLIZE := $(shell glibtoolize --help >/dev/null 2>&1 && echo g)libtoolize
--- a/src/agg.mk +++ b/src/agg.mk @@ -22,7 +22,7 @@ $(SED) -i 's,libtoolize,$(LIBTOOLIZE),' '$(1)/autogen.sh' cd '$(1)' && $(SHELL) ./autogen.sh \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --without-x
--- a/src/binutils.mk +++ b/src/binutils.mk @@ -26,7 +26,6 @@ $(INSTALL) -m755 '$(1)/config.guess' '$(PREFIX)/bin/' $(INSTALL) -m755 '$(1)/config.sub' '$(PREFIX)/bin/' - # Cannot use BUILD which was defined before config.guess existed. cd '$(1)' && ./configure \ --target='$(TARGET)' \ --build="`config.guess`" \
--- a/src/curl.mk +++ b/src/curl.mk @@ -22,7 +22,7 @@ cd '$(1)' && ./buildconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-gnutls \
--- a/src/devil.mk +++ b/src/devil.mk @@ -23,7 +23,7 @@ $(SED) -i 's,__declspec(dllimport),,' '$(1)/include/IL/il.h' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-ILU \
--- a/src/exiv2.mk +++ b/src/exiv2.mk @@ -22,7 +22,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-visibility \
--- a/src/fltk.mk +++ b/src/fltk.mk @@ -24,7 +24,7 @@ $(SED) -i 's,\$$uname,MINGW,g' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads \
--- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -25,7 +25,7 @@ $(SED) -i 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' '$(1)/fontconfig.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-arch='$(TARGET)' \
--- a/src/freetds.mk +++ b/src/freetds.mk @@ -28,7 +28,7 @@ cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-rpath \ --disable-dependency-tracking \ --disable-shared \
--- a/src/gcc.mk +++ b/src/gcc.mk @@ -33,7 +33,7 @@ mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ --target='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)' \ --libdir='$(PREFIX)/lib' \ --enable-languages='c,c++,objc,fortran' \
--- a/src/gdk-pixbuf.mk +++ b/src/gdk-pixbuf.mk @@ -23,7 +23,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-modules \
--- a/src/glib.mk +++ b/src/glib.mk @@ -55,7 +55,7 @@ # cross build cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-threads=win32 \
--- a/src/glibmm.mk +++ b/src/glibmm.mk @@ -22,7 +22,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ CXX='$(TARGET)-c++' \
--- a/src/gsl.mk +++ b/src/gsl.mk @@ -22,7 +22,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --enable-static
--- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -40,7 +40,7 @@ cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --enable-gnutls \ CPPFLAGS='-DWITH_NTLM'
--- a/src/gtkglext.mk +++ b/src/gtkglext.mk @@ -24,7 +24,7 @@ cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --without-x \
--- a/src/gtkmm2.mk +++ b/src/gtkmm2.mk @@ -24,7 +24,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ MAKE=$(MAKE)
--- a/src/gtksourceviewmm2.mk +++ b/src/gtksourceviewmm2.mk @@ -24,7 +24,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ MAKE=$(MAKE)
--- a/src/guile.mk +++ b/src/guile.mk @@ -25,7 +25,7 @@ # which would fail because we tell Guile not to use Pthreads. cd '$(1)' && CC_FOR_BUILD=gcc ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --without-threads \
--- a/src/ilmbase.mk +++ b/src/ilmbase.mk @@ -29,7 +29,7 @@ # threading. It will just disable the unwanted check for pthread. cd '$(1)' && $(SHELL) ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-threading \
--- a/src/imagemagick.mk +++ b/src/imagemagick.mk @@ -21,7 +21,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --with-x=no \
--- a/src/lame.mk +++ b/src/lame.mk @@ -21,7 +21,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/lcms.mk +++ b/src/lcms.mk @@ -22,7 +22,7 @@ cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --with-jpeg \ --with-tiff \
--- a/src/lcms1.mk +++ b/src/lcms1.mk @@ -23,7 +23,7 @@ cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --with-jpeg \ --with-tiff \
--- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -22,7 +22,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-gpg-error-prefix='$(PREFIX)/$(TARGET)'
--- a/src/libgomp.mk +++ b/src/libgomp.mk @@ -21,7 +21,7 @@ mkdir -p '$(1)/build/$(TARGET)/libgomp' cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --target='$(TARGET)' \ --prefix='$(PREFIX)' \ --enable-version-specific-runtime-libs \
--- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -21,7 +21,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \
--- a/src/libgsasl.mk +++ b/src/libgsasl.mk @@ -22,7 +22,7 @@ define $(PKG)_BUILD cd '$(1)' && touch src/libgsasl-7.def && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-nls \
--- a/src/libidn.mk +++ b/src/libidn.mk @@ -22,7 +22,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --disable-csharp \ --prefix='$(PREFIX)/$(TARGET)' \
--- a/src/libntlm.mk +++ b/src/libntlm.mk @@ -22,7 +22,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --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 @@ -23,7 +23,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libsigc++.mk +++ b/src/libsigc++.mk @@ -22,7 +22,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ CXX='$(TARGET)-c++' \
--- a/src/ogg.mk +++ b/src/ogg.mk @@ -21,7 +21,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/openexr.mk +++ b/src/openexr.mk @@ -34,7 +34,7 @@ bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-threading \
--- a/src/pangomm.mk +++ b/src/pangomm.mk @@ -22,7 +22,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ MAKE=$(MAKE)
--- a/src/pcre.mk +++ b/src/pcre.mk @@ -23,7 +23,7 @@ $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcreposix.h' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-utf8 \
--- a/src/theora.mk +++ b/src/theora.mk @@ -21,7 +21,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --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 @@ -23,7 +23,7 @@ $(SED) -i 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-compat24 \ @@ -71,7 +71,7 @@ $(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='$(BUILD)' \ + --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-compat24 \
--- a/src/xvidcore.mk +++ b/src/xvidcore.mk @@ -22,7 +22,7 @@ cd '$(1)' && autoconf cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --build='$(BUILD)' \ + --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' BUILD_DIR='build' SHARED_LIB= $(INSTALL) -d '$(PREFIX)/$(TARGET)/include'