blob: 27b08a8d0d9b8e9a1cf2640dc3e8d177b19584b0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From d4109317c70c86a67464b7deebbe0c3de88773e1 Mon Sep 17 00:00:00 2001
From: Xulin Sun <xulin.sun@windriver.com>
Date: Fri, 25 Mar 2016 12:33:04 +0800
Subject: [PATCH] libglusterfs: Don't link against libfl
Remove reference to yywrap by adding "%option noyywrap" statements to
the flex source file which doesn't override yywrap. After this, we no
longer need to link against libfl and so no longer get errors about
undefined references to yylex.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
---
libglusterfs/src/Makefile.am | 2 +-
libglusterfs/src/graph.l | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am
index 52b7316..ab5567a 100644
--- a/libglusterfs/src/Makefile.am
+++ b/libglusterfs/src/Makefile.am
@@ -11,7 +11,7 @@ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \
-I$(CONTRIBDIR)/libexecinfo ${ARGP_STANDALONE_CPPFLAGS} \
-DSBIN_DIR=\"$(sbindir)\" -I$(CONTRIBDIR)/timer-wheel
-libglusterfs_la_LIBADD = @LEXLIB@ $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS)
+libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS)
libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION)
lib_LTLIBRARIES = libglusterfs.la
diff --git a/libglusterfs/src/graph.l b/libglusterfs/src/graph.l
index 8af28a4..742d934 100644
--- a/libglusterfs/src/graph.l
+++ b/libglusterfs/src/graph.l
@@ -11,6 +11,7 @@
%x STRING
%option yylineno
%option noinput
+%option noyywrap
%{
#define YYSTYPE char *
|
