mirror of https://git.wownero.com/dsc/mxe.git
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
This commit is contained in:
parent
ff475f5abb
commit
148931b4ae
1
Makefile
1
Makefile
|
@ -16,7 +16,6 @@ MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
|
|||
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
|
||||
|
|
|
@ -22,7 +22,7 @@ define $(PKG)_BUILD
|
|||
$(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
|
||||
|
|
|
@ -26,7 +26,6 @@ define $(PKG)_BUILD
|
|||
$(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`" \
|
||||
|
|
|
@ -22,7 +22,7 @@ define $(PKG)_BUILD
|
|||
cd '$(1)' && ./buildconf
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--with-gnutls \
|
||||
|
|
|
@ -23,7 +23,7 @@ define $(PKG)_BUILD
|
|||
$(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 \
|
||||
|
|
|
@ -22,7 +22,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-visibility \
|
||||
|
|
|
@ -24,7 +24,7 @@ define $(PKG)_BUILD
|
|||
$(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 \
|
||||
|
|
|
@ -25,7 +25,7 @@ define $(PKG)_BUILD
|
|||
$(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)' \
|
||||
|
|
|
@ -28,7 +28,7 @@ define $(PKG)_BUILD
|
|||
cd '$(1)' && ./configure \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-rpath \
|
||||
--disable-dependency-tracking \
|
||||
--disable-shared \
|
||||
|
|
|
@ -33,7 +33,7 @@ define $(PKG)_BUILD
|
|||
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' \
|
||||
|
|
|
@ -23,7 +23,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-modules \
|
||||
|
|
|
@ -55,7 +55,7 @@ define $(PKG)_BUILD
|
|||
# cross build
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--with-threads=win32 \
|
||||
|
|
|
@ -22,7 +22,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
CXX='$(TARGET)-c++' \
|
||||
|
|
|
@ -22,7 +22,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-shared \
|
||||
--enable-static
|
||||
|
|
|
@ -40,7 +40,7 @@ define $(PKG)_BUILD
|
|||
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'
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ define $(PKG)_BUILD
|
|||
cd '$(1)' && autoconf
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-shared \
|
||||
--without-x \
|
||||
|
|
|
@ -24,7 +24,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
MAKE=$(MAKE)
|
||||
|
|
|
@ -24,7 +24,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-shared \
|
||||
MAKE=$(MAKE)
|
||||
|
|
|
@ -25,7 +25,7 @@ define $(PKG)_BUILD
|
|||
# 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 \
|
||||
|
|
|
@ -29,7 +29,7 @@ define $(PKG)_BUILD
|
|||
# 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 \
|
||||
|
|
|
@ -21,7 +21,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-shared \
|
||||
--with-x=no \
|
||||
|
|
|
@ -21,7 +21,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-shared
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)'
|
||||
|
|
|
@ -22,7 +22,7 @@ define $(PKG)_BUILD
|
|||
cd '$(1)' && ./configure \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--with-jpeg \
|
||||
--with-tiff \
|
||||
|
|
|
@ -23,7 +23,7 @@ define $(PKG)_BUILD
|
|||
cd '$(1)' && ./configure \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--with-jpeg \
|
||||
--with-tiff \
|
||||
|
|
|
@ -22,7 +22,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--with-gpg-error-prefix='$(PREFIX)/$(TARGET)'
|
||||
|
|
|
@ -21,7 +21,7 @@ define $(PKG)_BUILD
|
|||
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 \
|
||||
|
|
|
@ -21,7 +21,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-nls \
|
||||
|
|
|
@ -22,7 +22,7 @@ endef
|
|||
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 \
|
||||
|
|
|
@ -22,7 +22,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--disable-csharp \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
|
|
|
@ -22,7 +22,7 @@ endef
|
|||
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=
|
||||
|
|
|
@ -23,7 +23,7 @@ endef
|
|||
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=
|
||||
|
|
|
@ -22,7 +22,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
CXX='$(TARGET)-c++' \
|
||||
|
|
|
@ -21,7 +21,7 @@ endef
|
|||
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=
|
||||
|
|
|
@ -34,7 +34,7 @@ define $(PKG)_BUILD
|
|||
bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-threading \
|
||||
|
|
|
@ -22,7 +22,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build='$(BUILD)' \
|
||||
--build="`config.guess`" \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
MAKE=$(MAKE)
|
||||
|
|
|
@ -23,7 +23,7 @@ define $(PKG)_BUILD
|
|||
$(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 \
|
||||
|
|
|
@ -21,7 +21,7 @@ endef
|
|||
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=
|
||||
|
|
|
@ -23,7 +23,7 @@ define $(PKG)_BUILD
|
|||
$(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 @@ define $(PKG)_BUILD
|
|||
$(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 \
|
||||
|
|
|
@ -22,7 +22,7 @@ define $(PKG)_BUILD
|
|||
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'
|
||||
|
|
Loading…
Reference in New Issue