[gridengine] Add patch to run automake with --add-missing to fix qmake build
Orion Poplawski
orion at fedoraproject.org
Thu Sep 8 19:55:45 UTC 2011
commit 09c09cb0acfaa473ae434e891c351c840e7ca4a0
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Sep 8 13:55:35 2011 -0600
Add patch to run automake with --add-missing to fix qmake build
gridengine-add-missing.patch | 11 +++++++++++
gridengine.spec | 4 ++++
2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/gridengine-add-missing.patch b/gridengine-add-missing.patch
new file mode 100644
index 0000000..edf1f7f
--- /dev/null
+++ b/gridengine-add-missing.patch
@@ -0,0 +1,11 @@
+--- SGE6.2u5p2/source/3rdparty/qmake/glob/Makefile.in.add-missing 2011-04-05 11:27:52.000000000 -0600
++++ SGE6.2u5p2/source/3rdparty/qmake/glob/Makefile.in 2011-09-08 13:53:00.660119620 -0600
+@@ -113,7 +113,7 @@
+ .SUFFIXES:
+ .SUFFIXES: .S .c .o .s
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps glob/Makefile
++ cd $(top_srcdir) && $(AUTOMAKE) --add-missing --foreign --include-deps glob/Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
diff --git a/gridengine.spec b/gridengine.spec
index c42e1aa..7e2975e 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -77,6 +77,8 @@ Patch31: gridengine-jemalloc.patch
Patch32: gridengine-paths.patch
# Keep arch at lx26-* for linux3 for now
Patch33: gridengine-linux3.patch
+# Call automake with --add-missing
+Patch34: gridengine-add-missing.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: ppc64
@@ -203,6 +205,7 @@ sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
rm -r source/3rdparty/jemalloc
%patch32 -p1 -b .paths
%patch33 -p1 -b .linux3
+%patch34 -p1 -b .add-missing
sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
#Don't ship rctemplates
rm -rf source/dist/util/rctemplates
@@ -610,6 +613,7 @@ fi
* Thu Sep 8 2011 Orion Poplawski <orion at cora.nwra.com> 6.2u5p2-5
- Add patch to properly quote m4 macros
- Add patch to hack linux 3 support - keeps arch as lx26-*
+- Add patch to run automake with --add-missing to fix qmake build
* Tue Sep 6 2011 Orion Poplawski <orion at cora.nwra.com> 6.2u5p2-4
- Add SysV to systemd migration triggers
More information about the scm-commits
mailing list