[patch] ebuild patch to apply upstream commit working around automake bug

0001-sys-devel-flex-add-upstream-patch-for-automake-libob.patch (text/plain), 2.39 KB, created by Michael Haubenwallner (RETIRED) on 2017-09-13 12:07:02 UTC

From 0ff9687a23d04d303a244a1055d82996c6930d39 Mon Sep 17 00:00:00 2001
From: Michael Haubenwallner <[e-mail]>
Date: Wed, 13 Sep 2017 14:03:00 +0200
Subject: [PATCH] sys-devel/flex: add upstream patch for automake libobjdir bug

Upstream added this patch to work around the automake bug
"LIBOBJS should depend on LIBOBJDIR", automake bug#27781.

Gentoo-Bug: 625508

Package-Manager: Portage-2.3.6, Repoman-2.3.1
---
 sys-devel/flex/files/flex-2.6.4-libobjdir.patch | 36 +++++++++++++++++++++++++
 sys-devel/flex/flex-2.6.4.ebuild                |  6 ++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 sys-devel/flex/files/flex-2.6.4-libobjdir.patch

diff --git a/sys-devel/flex/files/flex-2.6.4-libobjdir.patch b/sys-devel/flex/files/flex-2.6.4-libobjdir.patch
new file mode 100644
index 00000000..878705b
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.4-libobjdir.patch
@@ -0,0 +1,36 @@
+From 24e73c4446841eda8d4ea01298e887059e8c1472 Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner <[e-mail]>
+Date: Wed, 19 Jul 2017 11:36:31 +0200
+Subject: [PATCH] have libobjs depend on libobjdir (#244)
+
+---
+ src/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e379692..0d13a5a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+#@@ -79,6 +79,8 @@ COMMON_SOURCES = \
+ 
+ LDADD = $(LIBOBJS) @LIBINTL@
+ 
++$(LIBOBJS): $(LIBOBJDIR)$(am__dirstamp)
++
+ include_HEADERS = \
+ 	FlexLexer.h
+ 
+-- 
+2.10.2
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1687,6 +1687,8 @@
+ @CROSS_TRUE@$(stage1flex_OBJECTS): CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+ @CROSS_TRUE@$(stage1flex_OBJECTS): LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
++$(LIBOBJS): $(LIBOBJDIR)$(am__dirstamp)
++
+ skel.c: flex.skl mkskel.sh flexint.h tables_shared.h tables_shared.c
+ 	$(SHELL) $(srcdir)/mkskel.sh $(srcdir) $(m4) $(VERSION) > $@.tmp
+ 	mv $@.tmp $@
diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
index c2d3293..cdbcae8 100644
--- a/sys-devel/flex/flex-2.6.4.ebuild
+++ b/sys-devel/flex/flex-2.6.4.ebuild
@@ -21,8 +21,12 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	test? ( sys-devel/bison )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-libobjdir.patch"
+)
+
 src_prepare() {
-	#epatch "${PATCHES[@]}"
+	epatch "${PATCHES[@]}"
 	epatch_user
 
 	# Disable running in the tests/ subdir as it has a bunch of built sources
-- 
2.10.2