d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Tony Theodore 2017-07-24 19:20:55 +10:00
parent cbebe1c878
commit 7bec03d8ad
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk2.mk
View File

@ -21,7 +21,7 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
--enable-explicit-deps \
--disable-glibtest \
@ -32,7 +32,12 @@ define $(PKG)_BUILD
--disable-man \
--with-included-immodules \
--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' \
-W -Wall -Werror -ansi \

9
src/gtk3.mk
View File

@ -20,7 +20,7 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cd '$(1)' && ./configure \
cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
--disable-glibtest \
--disable-cups \
@ -29,7 +29,12 @@ define $(PKG)_BUILD
--disable-man \
--with-included-immodules \
--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' \
-W -Wall -Werror -ansi \