Magellan Linux

Annotation of /trunk/libnl3/patches/libnl3-3.2.16-lex-failure.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1986 - (hide annotations) (download)
Tue Dec 4 13:12:22 2012 UTC (11 years, 5 months ago) by niro
Original Path: trunk/libnl/patches/libnl-3.2.16-lex-failure.patch
File size: 1510 byte(s)
-fixed build issues
1 niro 1986 From ab7f42e0bc97f4e04bcbc9f09b0ac41a06f90cf3 Mon Sep 17 00:00:00 2001
2     From: Jan Engelhardt <jengelh@inai.de>
3     Date: Tue, 27 Nov 2012 00:01:53 +0100
4     Subject: [PATCH] build: resolve lex failure
5    
6     This is an addendum to 0a9d5fcfa4c3fe8c930103f7639723dfd1ae4889,
7     which forgot to change ${LEX} to ${FLEX} in lib/Makefile.am.
8    
9     On openSUSE, /usr/bin/lex is a wrapper that calls `flex -l ...`.
10     libnl however requires flex, not lex or a compat mode thereof,
11     so using ${FLEX} is the proper thing to do.
12    
13     Signed-off-by: Jan Engelhardt <jengelh@inai.de>
14     ---
15     lib/Makefile.am | 4 ++--
16     1 files changed, 2 insertions(+), 2 deletions(-)
17    
18     diff --git a/lib/Makefile.am b/lib/Makefile.am
19     index 7481941..5adaffb 100644
20     --- a/lib/Makefile.am
21     +++ b/lib/Makefile.am
22     @@ -41,13 +41,13 @@ CLEANFILES = \
23     # Hack to avoid using ylwrap. It does not function correctly in combination
24     # with --header-file=
25     route/pktloc_grammar.c: route/pktloc_grammar.l
26     - $(AM_V_GEN) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
27     + $(AM_V_GEN) $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
28    
29     route/pktloc_syntax.c: route/pktloc_syntax.y
30     $(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
31    
32     route/cls/ematch_grammar.c: route/cls/ematch_grammar.l
33     - $(AM_V_GEN) $(LEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS) -o $@ $^
34     + $(AM_V_GEN) $(FLEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS) -o $@ $^
35    
36     route/cls/ematch_syntax.c: route/cls/ematch_syntax.y
37     $(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
38     --
39     1.7.7.6
40