[gnome-continuous] Drop parallel builds of gcab
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Drop parallel builds of gcab
- Date: Mon, 17 Jul 2017 19:10:57 +0000 (UTC)
commit 6a6d78546b8265c083852998a7eac2b33079c410
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Jul 17 20:10:18 2017 +0100
Drop parallel builds of gcab
Continuous is too fast, and Autotools are too broken.
manifest.json | 1 +
patches/gcab-no-parallel.patch | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 4dc288c..d22c85f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1072,6 +1072,7 @@
{"src": "git:git://github.com/hughsie/colord-gtk.git"},
{"src": "gnome:gcab",
+ "patches": ["gcab-no-parallel.patch"],
"config-opts": ["--disable-silent-rules", "--disable-static", "--enable-fast-install"]},
{"src": "git:git://github.com/hughsie/appstream-glib.git",
diff --git a/patches/gcab-no-parallel.patch b/patches/gcab-no-parallel.patch
new file mode 100644
index 0000000..118784b
--- /dev/null
+++ b/patches/gcab-no-parallel.patch
@@ -0,0 +1,36 @@
+From 878a78f86d7c6127fa5dfa55cddc3f74c62a1b6f Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Mon, 17 Jul 2017 20:08:58 +0100
+Subject: [PATCH] Drop parallel builds
+
+Sadly, autotools are bad, and generated files are a problem in 2017.
+---
+ Makefile.am | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 9fd2bc6..1242983 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -93,7 +93,10 @@ ENUMS_FILES = \
+ $(NULL)
+
+ $(GCAB_ENUMS): %: %.etemplate $(ENUMS_FILES)
+- $(AM_V_GEN)$(GLIB_MKENUMS) --template $^ | sed -e 's/g_cab/gcab/g' | sed -e 's/G_CAB/GCAB/g' | sed -e
's/_CAB//g' > $@
++ $(AM_V_GEN)$(GLIB_MKENUMS) --template $^ | \
++ sed -e 's/g_cab/gcab/g' \
++ -e 's/G_CAB/GCAB/g' \
++ -e 's/_CAB//g' > $@
+
+ EXTRA_DIST = \
+ gcab.doap \
+@@ -222,4 +225,6 @@ $(top_srcdir)/.version:
+ dist-hook:
+ echo $(VERSION) > $(distdir)/.tarball-version
+
++.NOTPARALLEL:
++
+ -include $(top_srcdir)/git.mk
+--
+2.13.0
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]