diff --git a/filesystem/gfs2-utils/gfs2-utils-0001-bison26.patch b/filesystem/gfs2-utils/gfs2-utils-0001-bison26.patch new file mode 100644 index 000000000..3d226dbad --- /dev/null +++ b/filesystem/gfs2-utils/gfs2-utils-0001-bison26.patch @@ -0,0 +1,59 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../gfs2-utils/gfs2-utils-0001-bison26.patch +# Copyright (C) 2013 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +From 110117a426f1edc0c3110a7776f10db186bc6f7d Mon Sep 17 00:00:00 2001 +From: Andrew Price +Date: Wed, 14 Nov 2012 12:22:03 +0000 +Subject: libgfs2: Fix build with bison 2.6 + +Bison 2.6 adds a prototype for yyparse in the generated parser.h, +creating a circular dependency between lexer.{c.h} and parser.h. + +This patch adds a typedef which breaks the cycle and allows libgfs2 to +build with bison 2.6 again. + +It also fixes a race between libgfs2.la and gfs2l by clarifying gfs2l's +dependency on libgfs2.la. + +Signed-off-by: Andrew Price +--- +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 + #include "lang.h" +-- +cgit v0.9.1 diff --git a/filesystem/gfs2-utils/gfs2-utils.cache b/filesystem/gfs2-utils/gfs2-utils.cache new file mode 100644 index 000000000..43f73bfb0 --- /dev/null +++ b/filesystem/gfs2-utils/gfs2-utils.cache @@ -0,0 +1,37 @@ + +[TIMESTAMP] 1361181594 Mon Feb 18 10:59:54 2013 +[BUILDTIME] 15 (5) +[SIZE] 0.70 MB, 32 files + +[DEP] autoconf +[DEP] automake +[DEP] bash +[DEP] binutils +[DEP] bison +[DEP] bzip2 +[DEP] coreutils +[DEP] diffutils +[DEP] fhs +[DEP] file +[DEP] findutils +[DEP] flex +[DEP] gawk +[DEP] gcc +[DEP] gettext +[DEP] git +[DEP] glibc +[DEP] grep +[DEP] gzip +[DEP] libtool +[DEP] linux-header +[DEP] m4 +[DEP] make +[DEP] ncurses +[DEP] patch +[DEP] perl +[DEP] pkgconfig +[DEP] sed +[DEP] sysfiles +[DEP] tar +[DEP] util-linux +[DEP] zlib diff --git a/filesystem/gfs2-utils/gfs2-utils.desc b/filesystem/gfs2-utils/gfs2-utils.desc new file mode 100644 index 000000000..9c5f48784 --- /dev/null +++ b/filesystem/gfs2-utils/gfs2-utils.desc @@ -0,0 +1,34 @@ +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../gfs2-utils/gfs2-utils.desc +[COPY] Copyright (C) 2013 The OpenSDE Project +[COPY] +[COPY] More information can be found in the files COPYING and README. +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-COPYRIGHT-NOTE-END --- + +[I] GFS2 filesystems utilities + +[T] The Global File System allows a cluster of machines to concurrently access +[T] shared storage hardware like SANs or iSCSI and network block devices. +[T] GFS can be deployed to build high-availability services without the single +[T] point of failure of a file server. + +[U] https://fedorahosted.org/cluster/wiki/HomePage + +[A] Redhat Inc. +[M] Christian Wiese + +[C] extra/filesystem + +[L] LGPL GPL +[S] Stable +[V] 3.1.5 +[P] X -----5---9 800.000 + +[D] 3503295986 gfs2-utils-3.1.5.tar.bz2 http://git.fedorahosted.org/cgit/gfs2-utils.git/snapshot/