From 2311cfeed4cf7b66f7360993017d9e4a920f6559 Mon Sep 17 00:00:00 2001 From: Felix Fietkau <nbd@openwrt.org> Date: Sun, 30 Nov 2014 20:12:07 +0000 Subject: [PATCH] gengetopt: fix parallel build issues (#18442) Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43440 --- tools/Makefile | 1 + tools/gengetopt/Makefile | 2 ++ tools/gengetopt/patches/100-dependency_fix.patch | 11 +++++++++++ 3 files changed, 14 insertions(+) create mode 100644 tools/gengetopt/patches/100-dependency_fix.patch diff --git a/tools/Makefile b/tools/Makefile index 27d0dc1c79..b9fc47e2ef 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -73,6 +73,7 @@ $(curdir)/padjffs2/compile := $(curdir)/findutils/install $(curdir)/cloog/compile := $(curdir)/ppl/install $(curdir)/bc/compile := $(curdir)/bison/install $(curdir)/findutils/compile := $(curdir)/bison/install +$(curdir)/gengetopt/compile := $(curdir)/automake/install ifneq ($(CONFIG_CCACHE),) $(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install)) diff --git a/tools/gengetopt/Makefile b/tools/gengetopt/Makefile index a66fbe6605..74e528e6fd 100644 --- a/tools/gengetopt/Makefile +++ b/tools/gengetopt/Makefile @@ -13,6 +13,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) PKG_MD5SUM:=29749a48dda69277ab969c510597a14e +HOST_FIXUP := autoreconf + HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/gengetopt/patches/100-dependency_fix.patch b/tools/gengetopt/patches/100-dependency_fix.patch new file mode 100644 index 0000000000..69cb598b7d --- /dev/null +++ b/tools/gengetopt/patches/100-dependency_fix.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -51,7 +51,7 @@ libgengetopt_la_LIBADD = $(top_builddir) + @LTLIBOBJS@ \ + skels/libgen.la + +-LDADD = $(top_builddir)/src/libgengetopt.la ++LDADD = libgengetopt.la + + EXTRA_DIST = parser.h argsdef.h gengetopt.h ggos.h gm.h gnugetopt.h \ + cmdline.c cmdline.h \ -- GitLab