diff options
Diffstat (limited to 'recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch')
-rw-r--r-- | recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch b/recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch index 27b08a8..660446b 100644 --- a/recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch +++ b/recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From d4109317c70c86a67464b7deebbe0c3de88773e1 Mon Sep 17 00:00:00 2001 | 1 | From 732bcca9f5fbb6defca8c327744d015d6747864b Mon Sep 17 00:00:00 2001 |
2 | From: Xulin Sun <xulin.sun@windriver.com> | 2 | From: "Hongzhi.Song" <hongzhi.song@windriver.com> |
3 | Date: Fri, 25 Mar 2016 12:33:04 +0800 | 3 | Date: Tue, 12 Mar 2019 19:56:59 -0700 |
4 | Subject: [PATCH] libglusterfs: Don't link against libfl | 4 | Subject: [PATCH] libglusterfs: Don't link against libfl |
5 | 5 | ||
6 | Remove reference to yywrap by adding "%option noyywrap" statements to | 6 | Remove reference to yywrap by adding "%option noyywrap" statements to |
@@ -11,25 +11,11 @@ undefined references to yylex. | |||
11 | Upstream-Status: Inappropriate [embedded specific] | 11 | Upstream-Status: Inappropriate [embedded specific] |
12 | 12 | ||
13 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> | 13 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> |
14 | 14 | Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> | |
15 | --- | 15 | --- |
16 | libglusterfs/src/Makefile.am | 2 +- | 16 | libglusterfs/src/graph.l | 1 + |
17 | libglusterfs/src/graph.l | 1 + | 17 | 1 file changed, 1 insertion(+) |
18 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
19 | 18 | ||
20 | diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am | ||
21 | index 52b7316..ab5567a 100644 | ||
22 | --- a/libglusterfs/src/Makefile.am | ||
23 | +++ b/libglusterfs/src/Makefile.am | ||
24 | @@ -11,7 +11,7 @@ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ | ||
25 | -I$(CONTRIBDIR)/libexecinfo ${ARGP_STANDALONE_CPPFLAGS} \ | ||
26 | -DSBIN_DIR=\"$(sbindir)\" -I$(CONTRIBDIR)/timer-wheel | ||
27 | |||
28 | -libglusterfs_la_LIBADD = @LEXLIB@ $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS) | ||
29 | +libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS) | ||
30 | libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION) | ||
31 | |||
32 | lib_LTLIBRARIES = libglusterfs.la | ||
33 | diff --git a/libglusterfs/src/graph.l b/libglusterfs/src/graph.l | 19 | diff --git a/libglusterfs/src/graph.l b/libglusterfs/src/graph.l |
34 | index 8af28a4..742d934 100644 | 20 | index 8af28a4..742d934 100644 |
35 | --- a/libglusterfs/src/graph.l | 21 | --- a/libglusterfs/src/graph.l |
@@ -42,3 +28,6 @@ index 8af28a4..742d934 100644 | |||
42 | %{ | 28 | %{ |
43 | 29 | ||
44 | #define YYSTYPE char * | 30 | #define YYSTYPE char * |
31 | -- | ||
32 | 2.17.1 | ||
33 | |||