mirror of https://git.wownero.com/dsc/mxe.git
gtk2/3: use new-style options and remove gailutil.def
`gailutil.def` causes package conflicts and `*.def` files aren't really relevant for MXE (see #1772).
This commit is contained in:
parent
cbebe1c878
commit
7bec03d8ad
|
@ -21,7 +21,7 @@ define $(PKG)_UPDATE
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(PKG)_BUILD
|
define $(PKG)_BUILD
|
||||||
cd '$(1)' && ./configure \
|
cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
|
||||||
$(MXE_CONFIGURE_OPTS) \
|
$(MXE_CONFIGURE_OPTS) \
|
||||||
--enable-explicit-deps \
|
--enable-explicit-deps \
|
||||||
--disable-glibtest \
|
--disable-glibtest \
|
||||||
|
@ -32,7 +32,12 @@ define $(PKG)_BUILD
|
||||||
--disable-man \
|
--disable-man \
|
||||||
--with-included-immodules \
|
--with-included-immodules \
|
||||||
--without-x
|
--without-x
|
||||||
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) EXTRA_DIST=
|
||||||
|
$(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_CRUFT) EXTRA_DIST=
|
||||||
|
|
||||||
|
# cleanup to avoid gtk2/3 conflicts (EXTRA_DIST doesn't exclude it)
|
||||||
|
# and *.def files aren't really relevant for MXE
|
||||||
|
rm -f '$(PREFIX)/$(TARGET)/lib/gailutil.def'
|
||||||
|
|
||||||
'$(TARGET)-gcc' \
|
'$(TARGET)-gcc' \
|
||||||
-W -Wall -Werror -ansi \
|
-W -Wall -Werror -ansi \
|
||||||
|
|
|
@ -20,7 +20,7 @@ define $(PKG)_UPDATE
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(PKG)_BUILD
|
define $(PKG)_BUILD
|
||||||
cd '$(1)' && ./configure \
|
cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
|
||||||
$(MXE_CONFIGURE_OPTS) \
|
$(MXE_CONFIGURE_OPTS) \
|
||||||
--disable-glibtest \
|
--disable-glibtest \
|
||||||
--disable-cups \
|
--disable-cups \
|
||||||
|
@ -29,7 +29,12 @@ define $(PKG)_BUILD
|
||||||
--disable-man \
|
--disable-man \
|
||||||
--with-included-immodules \
|
--with-included-immodules \
|
||||||
--enable-win32-backend
|
--enable-win32-backend
|
||||||
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) EXTRA_DIST=
|
||||||
|
$(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_CRUFT) EXTRA_DIST=
|
||||||
|
|
||||||
|
# cleanup to avoid gtk2/3 conflicts (EXTRA_DIST doesn't exclude it)
|
||||||
|
# and *.def files aren't really relevant for MXE
|
||||||
|
rm -f '$(PREFIX)/$(TARGET)/lib/gailutil.def'
|
||||||
|
|
||||||
'$(TARGET)-gcc' \
|
'$(TARGET)-gcc' \
|
||||||
-W -Wall -Werror -ansi \
|
-W -Wall -Werror -ansi \
|
||||||
|
|
Loading…
Reference in New Issue