| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | From e48b9097dce7bc2bfbb9e9c542124d3b5cebab39 Mon Sep 17 00:00:00 2001 |
| 2 | From: Paul Barker <paul@paulbarker.me.uk> |
| 3 | Date: Wed, 5 Mar 2014 13:39:14 +0000 |
| 4 | Subject: [PATCH] Don't link against libfl |
| 5 | |
| 6 | We can remove all references to yywrap by adding "%option noyywrap" statements |
| 7 | to each flex source file that doesn't override yywrap. After this, we no longer |
| 8 | need to link against libfl and so no longer get errors about undefined |
| 9 | references to yylex. |
| 10 | |
| 11 | Signed-off-by: Paul Barker <paul@paulbarker.me.uk> |
| 12 | Upstream-status: Submitted 2014-03-11 |
| 13 | see http://sourceforge.net/p/ipsec-tools/mailman/ipsec-tools-devel/thread/CANyK_8ewmxGA3vBVJW6s1APXPmxPR%2BDFWZ61EL8pCt288aKQ6w%40mail.gmail.com/#msg32088797 |
| 14 | --- |
| 15 | src/libipsec/Makefile.am | 1 - |
| 16 | src/racoon/Makefile.am | 2 +- |
| 17 | src/racoon/cftoken.l | 2 ++ |
| 18 | src/setkey/Makefile.am | 1 - |
| 19 | src/setkey/token.l | 2 ++ |
| 20 | 5 files changed, 5 insertions(+), 3 deletions(-) |
| 21 | |
| 22 | diff --git a/src/libipsec/Makefile.am b/src/libipsec/Makefile.am |
| 23 | index 6a4e3b3..df1e106 100644 |
| 24 | --- a/src/libipsec/Makefile.am |
| 25 | +++ b/src/libipsec/Makefile.am |
| 26 | @@ -26,7 +26,6 @@ libipsec_la_SOURCES = \ |
| 27 | # version is current:revision:age. |
| 28 | # See: http://www.gnu.org/manual/libtool-1.4.2/html_chapter/libtool_6.html#SEC32 |
| 29 | libipsec_la_LDFLAGS = -version-info 0:1:0 |
| 30 | -libipsec_la_LIBADD = $(LEXLIB) |
| 31 | |
| 32 | noinst_HEADERS = ipsec_strerror.h |
| 33 | |
| 34 | diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am |
| 35 | index dbaded9..0662957 100644 |
| 36 | --- a/src/racoon/Makefile.am |
| 37 | +++ b/src/racoon/Makefile.am |
| 38 | @@ -38,7 +38,7 @@ racoon_SOURCES = \ |
| 39 | cftoken.l cfparse.y prsa_tok.l prsa_par.y |
| 40 | EXTRA_racoon_SOURCES = isakmp_xauth.c isakmp_cfg.c isakmp_unity.c throttle.c \ |
| 41 | isakmp_frag.c nattraversal.c security.c $(MISSING_ALGOS) |
| 42 | -racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(LEXLIB) \ |
| 43 | +racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) \ |
| 44 | $(SECCTX_OBJS) vmbuf.o sockmisc.o misc.o ../libipsec/libipsec.la |
| 45 | racoon_DEPENDENCIES = \ |
| 46 | $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(SECCTX_OBJS) \ |
| 47 | diff --git a/src/racoon/cftoken.l b/src/racoon/cftoken.l |
| 48 | index 490242c..1701922 100644 |
| 49 | --- a/src/racoon/cftoken.l |
| 50 | +++ b/src/racoon/cftoken.l |
| 51 | @@ -106,6 +106,8 @@ static int incstackp = 0; |
| 52 | static int yy_first_time = 1; |
| 53 | %} |
| 54 | |
| 55 | +%option noyywrap |
| 56 | + |
| 57 | /* common seciton */ |
| 58 | nl \n |
| 59 | ws [ \t]+ |
| 60 | diff --git a/src/setkey/Makefile.am b/src/setkey/Makefile.am |
| 61 | index 746c1f1..389e6cf 100644 |
| 62 | --- a/src/setkey/Makefile.am |
| 63 | +++ b/src/setkey/Makefile.am |
| 64 | @@ -13,7 +13,6 @@ setkey_SOURCES = \ |
| 65 | |
| 66 | setkey_LDFLAGS = ../libipsec/libipsec.la |
| 67 | setkey_DEPENDENCIES = ../libipsec/libipsec.la |
| 68 | -setkey_LDADD = $(LEXLIB) |
| 69 | |
| 70 | noinst_HEADERS = vchar.h extern.h |
| 71 | man8_MANS = setkey.8 |
| 72 | diff --git a/src/setkey/token.l b/src/setkey/token.l |
| 73 | index ad3d843..eb23b76 100644 |
| 74 | --- a/src/setkey/token.l |
| 75 | +++ b/src/setkey/token.l |
| 76 | @@ -88,6 +88,8 @@ |
| 77 | #endif |
| 78 | %} |
| 79 | |
| 80 | +%option noyywrap |
| 81 | + |
| 82 | /* common section */ |
| 83 | nl \n |
| 84 | ws [ \t]+ |
| 85 | -- |
| 86 | 1.9.0 |
| 87 | |