diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2014-09-24 13:55:54 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2014-09-24 13:55:54 +0800 |
| commit | 536cb988a745189545b245abc55f1c4d16abc34a (patch) | |
| tree | 3cb7a87dd342098f95cc1939dda9bef1399d7420 /mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch | |
| parent | 260730270d71e6679fb4a2433715a4327e3ed8f0 (diff) | |
| download | AUR-PKGBUILD-536cb988a745189545b245abc55f1c4d16abc34a.tar AUR-PKGBUILD-536cb988a745189545b245abc55f1c4d16abc34a.tar.gz AUR-PKGBUILD-536cb988a745189545b245abc55f1c4d16abc34a.tar.bz2 AUR-PKGBUILD-536cb988a745189545b245abc55f1c4d16abc34a.tar.lz AUR-PKGBUILD-536cb988a745189545b245abc55f1c4d16abc34a.tar.xz AUR-PKGBUILD-536cb988a745189545b245abc55f1c4d16abc34a.tar.zst AUR-PKGBUILD-536cb988a745189545b245abc55f1c4d16abc34a.zip | |
mingw-w64-gtk3: 3.12.2 -> 3.14.0
Diffstat (limited to 'mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch')
| -rw-r--r-- | mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch b/mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch new file mode 100644 index 0000000..16f243c --- /dev/null +++ b/mingw-w64-gtk3/0001-Bug-731013-cross-compilation-broken-when-building-ex.patch @@ -0,0 +1,62 @@ +From cd93006829d56782d605b4202c45e1aad7ce1746 Mon Sep 17 00:00:00 2001 +From: Jehan <jehan@girinstud.io> +Date: Wed, 13 Aug 2014 05:08:08 +0000 +Subject: [PATCH 1/3] Bug 731013 - cross-compilation broken when building + extract-strings + +It is actually a bad idea to use noinst_PROGRAMS for build tools, +because it adds a $(EXEEXT). It is best to override the all target +with all-local to trigger the tool build. +--- + gtk/Makefile.am | 2 +- + gtk/inspector/Makefile.am | 2 +- + util/Makefile.am | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index 5c31084..7b78fb8 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -1566,7 +1566,7 @@ distclean-local: + if test $(srcdir) != .; then \ + rm -f $(MAINTAINERCLEANFILES); \ + rm -rf stock-icons; \ +- rm -f extract-strings$(EXEEXT); \ ++ rm -f extract-strings$(BUILD_EXEEXT); \ + rm -f $(template_headers); \ + fi + +diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am +index 9e14945..7b1876f 100644 +--- a/gtk/inspector/Makefile.am ++++ b/gtk/inspector/Makefile.am +@@ -114,7 +114,7 @@ templates = \ + + template_headers = $(templates:.ui=.ui.h) + +-extract_strings = $(top_builddir)/util/extract-strings ++extract_strings = $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) + + %.ui.h : %.ui + $(AM_V_GEN) $(extract_strings) $< > $@ +diff --git a/util/Makefile.am b/util/Makefile.am +index e8cf8fd..d0aa488 100644 +--- a/util/Makefile.am ++++ b/util/Makefile.am +@@ -4,10 +4,10 @@ extract_strings_cppflags = + extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD) + extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD) + +-extract-strings$(EXEEXT): $(extract_strings_sources) +- @rm -f extract-strings ++extract-strings$(BUILD_EXEEXT): $(extract_strings_sources) ++ @rm -f extract-strings$(BUILD_EXEEXT) + $(AM_V_CCLD)$(CC_FOR_BUILD) $(extract_strings_cppflags) $(CPPFLAGS_FOR_BUILD) $(extract_strings_cflags) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(extract_strings_ldadd) $(LIBS_FOR_BUILD) -o $@ + +-noinst_PROGRAMS = extract-strings ++all-local: extract-strings$(BUILD_EXEEXT) + + -include $(top_srcdir)/git.mk +-- +1.8.1.2 + |