diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2017-07-26 08:42:09 +0800 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-07-26 10:07:52 -0400 |
| commit | 5bda0e0c27cef4b2bf73a6be8771778ddeece215 (patch) | |
| tree | c094588f7508db9324ea3e11c6dc8965762eebed /recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch | |
| parent | 4e05423f1542403651fe3e4623693aac857642bb (diff) | |
| download | meta-cloud-services-5bda0e0c27cef4b2bf73a6be8771778ddeece215.tar.gz | |
glusterfs: uprev to 3.11.1
* Add systemd support
* Drop the following patch which already fixed in upstream:
0001-Fix-for-mount.glusterfs-not-accepting-version-argume.patch
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
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 | 46 |
1 files changed, 46 insertions, 0 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 new file mode 100644 index 0000000..97548a5 --- /dev/null +++ b/recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | From c8be736bd972bb40b03a34bf9565e1bf4880fa7f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Xulin Sun <xulin.sun@windriver.com> | ||
| 3 | Date: Fri, 25 Mar 2016 12:33:04 +0800 | ||
| 4 | Subject: [PATCH] libglusterfs: Don't link against libfl | ||
| 5 | |||
| 6 | Remove reference to yywrap by adding "%option noyywrap" statements to | ||
| 7 | the flex source file which doesn't override yywrap. After this, we no | ||
| 8 | longer need to link against libfl and so no longer get errors about | ||
| 9 | undefined references to yylex. | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [embedded specific] | ||
| 12 | |||
| 13 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> | ||
| 14 | --- | ||
| 15 | libglusterfs/src/Makefile.am | 2 +- | ||
| 16 | libglusterfs/src/graph.l | 1 + | ||
| 17 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am | ||
| 20 | index 85886c1..e90f553 100644 | ||
| 21 | --- a/libglusterfs/src/Makefile.am | ||
| 22 | +++ b/libglusterfs/src/Makefile.am | ||
| 23 | @@ -8,7 +8,7 @@ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ | ||
| 24 | -I$(CONTRIBDIR)/libexecinfo ${ARGP_STANDALONE_CPPFLAGS} \ | ||
| 25 | -DSBIN_DIR=\"$(sbindir)\" -I$(CONTRIBDIR)/timer-wheel | ||
| 26 | |||
| 27 | -libglusterfs_la_LIBADD = @LEXLIB@ $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS) | ||
| 28 | +libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS) | ||
| 29 | libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION) | ||
| 30 | |||
| 31 | lib_LTLIBRARIES = libglusterfs.la | ||
| 32 | diff --git a/libglusterfs/src/graph.l b/libglusterfs/src/graph.l | ||
| 33 | index e4eba9c..78c6ef8 100644 | ||
| 34 | --- a/libglusterfs/src/graph.l | ||
| 35 | +++ b/libglusterfs/src/graph.l | ||
| 36 | @@ -11,6 +11,7 @@ | ||
| 37 | %x STRING | ||
| 38 | %option yylineno | ||
| 39 | %option noinput | ||
| 40 | +%option noyywrap | ||
| 41 | %{ | ||
| 42 | |||
| 43 | #define YYSTYPE char * | ||
| 44 | -- | ||
| 45 | 1.9.1 | ||
| 46 | |||
