summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-cluster/glusterfs/files')
-rw-r--r--sys-cluster/glusterfs/files/glusterfs-2.0.8-parallel-make.patch11
-rw-r--r--sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch22
2 files changed, 22 insertions, 11 deletions
diff --git a/sys-cluster/glusterfs/files/glusterfs-2.0.8-parallel-make.patch b/sys-cluster/glusterfs/files/glusterfs-2.0.8-parallel-make.patch
deleted file mode 100644
index fbe63330f03f..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-2.0.8-parallel-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/glusterfsd/src/Makefile.am b/glusterfsd/src/Makefile.am
-index 0609179..548ed3a 100644
---- a/glusterfsd/src/Makefile.am
-+++ b/glusterfsd/src/Makefile.am
-@@ -20,5 +20,6 @@ uninstall-local:
- install-data-local:
- $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run
- $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/glusterfs
-+ $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
- rm -f $(DESTDIR)$(sbindir)/glusterfs
- ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch b/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch
new file mode 100644
index 000000000000..9320c12ea7b1
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch
@@ -0,0 +1,22 @@
+--- glusterfsd/src/Makefile.am
++++ glusterfsd/src/Makefile.am
+@@ -20,5 +20,6 @@ uninstall-local:
+ install-data-local:
+ $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run
+ $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/glusterfs
++ $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
+ rm -f $(DESTDIR)$(sbindir)/glusterfs
+ ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs
+--- libglusterfs/src/Makefile.am
++++ libglusterfs/src/Makefile.am
+@@ -15,7 +15,9 @@
+ graph.lex.c: graph.l y.tab.h
+ $(LEX) -t $(srcdir)/graph.l > $@
+
+-y.tab.c y.tab.h: graph.y
++y.tab.c: y.tab.h
++
++y.tab.h: graph.y
+ $(YACC) -d $(srcdir)/graph.y
+
+ CLEANFILES = graph.lex.c y.tab.c y.tab.h