Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 625508 | Differences between
and this patch

Collapse All | Expand All

(-)a/sys-devel/flex/files/flex-2.6.4-libobjdir.patch (+36 lines)
Line 0 Link Here
1
From 24e73c4446841eda8d4ea01298e887059e8c1472 Mon Sep 17 00:00:00 2001
2
From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
3
Date: Wed, 19 Jul 2017 11:36:31 +0200
4
Subject: [PATCH] have libobjs depend on libobjdir (#244)
5
6
---
7
 src/Makefile.am | 2 ++
8
 1 file changed, 2 insertions(+)
9
10
diff --git a/src/Makefile.am b/src/Makefile.am
11
index e379692..0d13a5a 100644
12
--- a/src/Makefile.am
13
+++ b/src/Makefile.am
14
#@@ -79,6 +79,8 @@ COMMON_SOURCES = \
15
 
16
 LDADD = $(LIBOBJS) @LIBINTL@
17
 
18
+$(LIBOBJS): $(LIBOBJDIR)$(am__dirstamp)
19
+
20
 include_HEADERS = \
21
 	FlexLexer.h
22
 
23
-- 
24
2.10.2
25
26
--- a/src/Makefile.in
27
+++ b/src/Makefile.in
28
@@ -1687,6 +1687,8 @@
29
 @CROSS_TRUE@$(stage1flex_OBJECTS): CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
30
 @CROSS_TRUE@$(stage1flex_OBJECTS): LDFLAGS=$(LDFLAGS_FOR_BUILD)
31
 
32
+$(LIBOBJS): $(LIBOBJDIR)$(am__dirstamp)
33
+
34
 skel.c: flex.skl mkskel.sh flexint.h tables_shared.h tables_shared.c
35
 	$(SHELL) $(srcdir)/mkskel.sh $(srcdir) $(m4) $(VERSION) > $@.tmp
36
 	mv $@.tmp $@
(-)a/sys-devel/flex/flex-2.6.4.ebuild (-2 / +5 lines)
Lines 21-28 DEPEND="${RDEPEND} Link Here
21
	nls? ( sys-devel/gettext )
21
	nls? ( sys-devel/gettext )
22
	test? ( sys-devel/bison )"
22
	test? ( sys-devel/bison )"
23
23
24
PATCHES=(
25
	"${FILESDIR}/${P}-libobjdir.patch"
26
)
27
24
src_prepare() {
28
src_prepare() {
25
	#epatch "${PATCHES[@]}"
29
	epatch "${PATCHES[@]}"
26
	epatch_user
30
	epatch_user
27
31
28
	# Disable running in the tests/ subdir as it has a bunch of built sources
32
	# Disable running in the tests/ subdir as it has a bunch of built sources
29
- 

Return to bug 625508