020dbfae51
Removes mount.gfs2, gfs2_tool, gfs2_quota - Remove rawhide_transition.patch - now obsolete - Update BuildRequires: Change glibc-kernheaders to kernel-headers Add bison and flex - Provide a valid url for Source0 - Add fix_build_on_rawhide.patch to fix a circular dep introduced in bison 2.6, and a make -j race between libgfs2 and gfs2l
26 lines
822 B
Diff
26 lines
822 B
Diff
diff --git a/gfs2/libgfs2/Makefile.am b/gfs2/libgfs2/Makefile.am
|
|
index 9c4e96b..b57f6d9 100644
|
|
--- a/gfs2/libgfs2/Makefile.am
|
|
+++ b/gfs2/libgfs2/Makefile.am
|
|
@@ -23,7 +23,7 @@ libgfs2_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 \
|
|
|
|
gfs2l_SOURCES = gfs2l.c
|
|
gfs2l_CPPFLAGS = -I$(top_srcdir)/gfs2/include
|
|
-gfs2l_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
|
|
+gfs2l_LDADD = libgfs2.la
|
|
|
|
# Autotools can't handle header files output by flex so we have to generate it manually
|
|
lexer.h: lexer.l
|
|
diff --git a/gfs2/libgfs2/parser.y b/gfs2/libgfs2/parser.y
|
|
index 084d15e..0321d74 100644
|
|
--- a/gfs2/libgfs2/parser.y
|
|
+++ b/gfs2/libgfs2/parser.y
|
|
@@ -1,3 +1,7 @@
|
|
+%code requires {
|
|
+/* Required to break a circular dependency introduced with bison 2.6 */
|
|
+typedef void* yyscan_t;
|
|
+}
|
|
%code top {
|
|
#include <errno.h>
|
|
#include "lang.h"
|