rpms/condor/devel DetectGCC431.patch,NONE,1.1 condor.spec,1.5,1.6

Matthew Farrellee (matt) fedora-extras-commits at redhat.com
Wed Aug 6 16:11:52 UTC 2008


Author: matt

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6678

Modified Files:
	condor.spec 
Added Files:
	DetectGCC431.patch 
Log Message:
Detect gcc-4.3.1, ugh

DetectGCC431.patch:

--- NEW FILE DetectGCC431.patch ---
commit ab7627ff03013f126826d31bf031759fb395d523
Author: Matthew Farrellee <mfarrellee at redhat.com>
Date:   Wed Aug 6 11:09:23 2008 -0500

    Detect GCC 4.3.1, seems that the default should be to parse gcc_vers

diff --git a/src/configure.ac b/src/configure.ac
index 566238e..db0eea6 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -884,6 +884,12 @@ case "$gcc_vers" in
     CompilerMinor="2"
     CompilerPatch="1"
     ;;
+ "4.3.1" )
+    CompilerKind="GCC"
+    CompilerMajor="4"
+    CompilerMinor="3"
+    CompilerPatch="1"
+    ;;
  * )
     if test "x$enable_gcc_version_check" = "xyes"; then
       AC_MSG_RESULT([ERROR])


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- condor.spec	6 Aug 2008 15:55:17 -0000	1.5
+++ condor.spec	6 Aug 2008 16:11:22 -0000	1.6
@@ -23,6 +23,7 @@
 Patch2: GLibCFlag28.patch
 Patch3: DetectGCC430.patch
 Patch4: autoconf-relax-quoting.patch
+Patch5: DetectGCC431.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -95,6 +96,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -457,6 +459,7 @@
 - Updated to 7.0.4 source
 - Stopped using condor_configure in install step
 - Patched aclocal.m4 to handle autoconf 2.62
+- Patched configure.ac to handle gcc-4.3.1
 
 * Tue Jun 10 2008  <mfarrellee at redhat> - 7.0.2-1
 - Updated to 7.0.2 source




More information about the fedora-extras-commits mailing list