[gridengine] Add patch to properly quote m4 macros Add patch to hack linux 3 support - keeps arch as lx26-*
Orion Poplawski
orion at fedoraproject.org
Thu Sep 8 18:10:51 UTC 2011
commit ec22fb1bab21d20822bc7f00670ecba489abded9
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Sep 8 12:10:38 2011 -0600
Add patch to properly quote m4 macros
Add patch to hack linux 3 support - keeps arch as lx26-*
gridengine-linux3.patch | 16 ++++++
gridengine-quotes.patch | 120 +++++++++++++++++++++++++++++++++++++++++++++++
gridengine.spec | 12 ++++-
3 files changed, 147 insertions(+), 1 deletions(-)
---
diff --git a/gridengine-linux3.patch b/gridengine-linux3.patch
new file mode 100644
index 0000000..e249f41
--- /dev/null
+++ b/gridengine-linux3.patch
@@ -0,0 +1,16 @@
+--- SGE6.2u5p2/source/dist/util/arch.linux3 2011-04-05 11:27:49.000000000 -0600
++++ SGE6.2u5p2/source/dist/util/arch 2011-09-08 11:33:32.368373002 -0600
+@@ -255,12 +255,9 @@
+ fi
+ fi
+ ;;
+- 2.6.*)
++ *)
+ lxrelease=26
+ ;;
+- *)
+- unsupported="UNSUPPORTED-"
+- lxrelease=$osrelease
+ esac
+ ARCH=${unsupported}lx${lxrelease}-${lxmachine}
+ ;;
diff --git a/gridengine-quotes.patch b/gridengine-quotes.patch
new file mode 100644
index 0000000..17e2dd0
--- /dev/null
+++ b/gridengine-quotes.patch
@@ -0,0 +1,120 @@
+diff -up SGE6.2u5p2/source/3rdparty/qmake/aclocal.m4.quotes SGE6.2u5p2/source/3rdparty/qmake/aclocal.m4
+--- SGE6.2u5p2/source/3rdparty/qmake/aclocal.m4.quotes 2011-04-05 11:27:54.000000000 -0600
++++ SGE6.2u5p2/source/3rdparty/qmake/aclocal.m4 2011-09-08 10:12:38.514091438 -0600
+@@ -110,7 +110,7 @@ dnl Written by Paul Eggert <eggert at twins
+
+ dnl Internal subroutine of AC_SYS_LARGEFILE.
+ dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME)
+-AC_DEFUN(AC_SYS_LARGEFILE_FLAGS,
++AC_DEFUN([AC_SYS_LARGEFILE_FLAGS],
+ [AC_CACHE_CHECK([for $1 value to request large file support],
+ ac_cv_sys_largefile_$1,
+ [ac_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || {
+@@ -143,7 +143,7 @@ changequote([, ])dnl
+
+ dnl Internal subroutine of AC_SYS_LARGEFILE.
+ dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL)
+-AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,
++AC_DEFUN([AC_SYS_LARGEFILE_SPACE_APPEND],
+ [case $2 in
+ no) ;;
+ ?*)
+@@ -155,7 +155,7 @@ AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,
+
+ dnl Internal subroutine of AC_SYS_LARGEFILE.
+ dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT)
+-AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
++AC_DEFUN([AC_SYS_LARGEFILE_MACRO_VALUE],
+ [AC_CACHE_CHECK([for $1], $2,
+ [$2=no
+ changequote(, )dnl
+@@ -174,7 +174,7 @@ changequote([, ])dnl
+ AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])
+ fi])
+
+-AC_DEFUN(AC_SYS_LARGEFILE,
++AC_DEFUN([AC_SYS_LARGEFILE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_ARG_ENABLE(largefile,
+ [ --disable-largefile omit support for large files])
+@@ -232,7 +232,7 @@ dnl From Paul Eggert <eggert at twinsun.com
+ dnl Define HAVE_INTTYPES_H if <inttypes.h> exists,
+ dnl doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+-AC_DEFUN(jm_AC_HEADER_INTTYPES_H,
++AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
+ [
+ if test x = y; then
+ dnl This code is deliberately never run via ./configure.
+@@ -257,7 +257,7 @@ AC_DEFUN(jm_AC_HEADER_INTTYPES_H,
+ dnl ---------------------------------------------------------------------------
+ dnl From Paul Eggert <eggert at twinsun.com>
+
+-AC_DEFUN(AC_STRUCT_ST_MTIM_NSEC,
++AC_DEFUN([AC_STRUCT_ST_MTIM_NSEC],
+ [AC_CACHE_CHECK([for nanoseconds member of struct stat.st_mtim],
+ ac_cv_struct_st_mtim_nsec,
+ [ac_save_CPPFLAGS="$CPPFLAGS"
+@@ -287,7 +287,7 @@ dnl From Paul Eggert <eggert at twinsun.com
+ dnl Define uintmax_t to `unsigned long' or `unsigned long long'
+ dnl if <inttypes.h> does not exist.
+
+-AC_DEFUN(jm_AC_TYPE_UINTMAX_T,
++AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
+ [
+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+ if test $jm_ac_cv_header_inttypes_h = no; then
+@@ -313,7 +313,7 @@ dnl From a proposed change made on the a
+ dnl http://sourceware.cygnus.com/ml/autoconf/1999-02/msg00001.html
+ dnl Patch for AIX 3.2 by Lars Hecking <lhecking at nmrc.ucc.ie> on 17 May 1999
+
+-AC_DEFUN(AC_FUNC_SELECT,
++AC_DEFUN([AC_FUNC_SELECT],
+ [AC_CHECK_FUNCS(select)
+ if test "$ac_cv_func_select" = yes; then
+ AC_CHECK_HEADERS(unistd.h sys/types.h sys/time.h sys/select.h sys/socket.h)
+@@ -417,7 +417,7 @@ fi
+ # program @code{ansi2knr}, which comes with Ghostscript.
+ # @end defmac
+
+-AC_DEFUN(AM_PROG_CC_STDC,
++AC_DEFUN([AM_PROG_CC_STDC],
+ [AC_REQUIRE([AC_PROG_CC])
+ AC_BEFORE([$0], [AC_C_INLINE])
+ AC_BEFORE([$0], [AC_C_CONST])
+@@ -496,7 +496,7 @@ esac
+ dnl Usage:
+ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+-AC_DEFUN(AM_INIT_AUTOMAKE,
++AC_DEFUN([AM_INIT_AUTOMAKE],
+ [AC_REQUIRE([AC_PROG_INSTALL])
+ PACKAGE=[$1]
+ AC_SUBST(PACKAGE)
+@@ -524,7 +524,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
+ # Check to make sure that the build environment is sane.
+ #
+
+-AC_DEFUN(AM_SANITY_CHECK,
++AC_DEFUN([AM_SANITY_CHECK],
+ [AC_MSG_CHECKING([whether build environment is sane])
+ # Just in case
+ sleep 1
+@@ -565,7 +565,7 @@ AC_MSG_RESULT(yes)])
+
+ dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+ dnl The program must properly implement --version.
+-AC_DEFUN(AM_MISSING_PROG,
++AC_DEFUN([AM_MISSING_PROG],
+ [AC_MSG_CHECKING(for working $2)
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+@@ -581,7 +581,7 @@ AC_SUBST($1)])
+
+ # Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+-AC_DEFUN(AM_CONFIG_HEADER,
++AC_DEFUN([AM_CONFIG_HEADER],
+ [AC_PREREQ([2.12])
+ AC_CONFIG_HEADER([$1])
+ dnl When config.status generates a header, we must update the stamp-h file.
diff --git a/gridengine.spec b/gridengine.spec
index 9a4bf9a..c42e1aa 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -6,7 +6,7 @@
Name: gridengine
Version: 6.2u5p2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Grid Engine - Distributed Computing Management software
Group: Applications/System
@@ -53,6 +53,8 @@ Patch7: gridengine-6.2u2_1-Werror.patch
# Need to patch -Dant.library.dir=/usr/share/ant/lib to ant processes
# http://gridengine.sunsource.net/issues/show_bug.cgi?id=3171
Patch8: gridengine-6.2u4-ant.patch
+# Add patch to properly quote m4 macros
+Patch9: gridengine-quotes.patch
# Support lesstif - http://gridengine.sunsource.net/issues/show_bug.cgi?id=2310
Patch15: gridengine-6.2beta2-lesstif.patch
# Make inst_sge exit with status 1 if usage is incorrect
@@ -73,6 +75,8 @@ Patch28: gridengine-6.2u5-gethostname.patch
Patch31: gridengine-jemalloc.patch
# Fix some '//' in include paths
Patch32: gridengine-paths.patch
+# Keep arch at lx26-* for linux3 for now
+Patch33: gridengine-linux3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: ppc64
@@ -184,6 +188,7 @@ sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
%patch6 -p1 -b .db
%patch7 -p1 -b .Werror
%patch8 -p1 -b .ant
+%patch9 -p1 -b .quotes
%if !0%{?rhel}
%patch15 -p1 -b .lesstif
%endif
@@ -197,6 +202,7 @@ sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
%patch31 -p1 -b .jemalloc
rm -r source/3rdparty/jemalloc
%patch32 -p1 -b .paths
+%patch33 -p1 -b .linux3
sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
#Don't ship rctemplates
rm -rf source/dist/util/rctemplates
@@ -601,6 +607,10 @@ fi
%changelog
+* 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-*
+
* 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