rpms/condor/devel DetectGCC430.patch, NONE, 1.1 GLibCFlag28.patch, NONE, 1.1 better-analyze-everywhere.patch, NONE, 1.1 condor_config.generic.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 condor.spec, 1.3, 1.4 generate-tarball.sh, 1.1, 1.2 sources, 1.2, 1.3 f9_gcc_detection.patch, 1.1, NONE f9_glibc_detection.patch, 1.1, NONE isolate-gsoap-linking.patch, 1.1, NONE lsb_init.patch, 1.2, NONE
Matthew Farrellee (matt)
fedora-extras-commits at redhat.com
Wed Aug 6 15:04:41 UTC 2008
Author: matt
Update of /cvs/pkgs/rpms/condor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27699
Modified Files:
.cvsignore condor.spec generate-tarball.sh sources
Added Files:
DetectGCC430.patch GLibCFlag28.patch
better-analyze-everywhere.patch condor_config.generic.patch
Removed Files:
f9_gcc_detection.patch f9_glibc_detection.patch
isolate-gsoap-linking.patch lsb_init.patch
Log Message:
sync with F-9
DetectGCC430.patch:
--- NEW FILE DetectGCC430.patch ---
diff -ru condor-7.0.2.orig/src/configure.ac condor-7.0.2/src/configure.ac
--- condor-7.0.2.orig/src/configure.ac 2008-06-11 10:04:54.000000000 -0500
+++ condor-7.0.2/src/configure.ac 2008-06-11 10:04:07.000000000 -0500
@@ -877,6 +877,12 @@
CompilerMinor="2"
CompilerPatch="1"
;;
+ "4.3.0" )
+ CompilerKind="GCC"
+ CompilerMajor="4"
+ CompilerMinor="3"
+ CompilerPatch="0"
+ ;;
* )
if test "x$enable_gcc_version_check" = "xyes"; then
AC_MSG_RESULT([ERROR])
GLibCFlag28.patch:
--- NEW FILE GLibCFlag28.patch ---
diff -ru condor-7.0.2.orig/config/LINUX.cf condor-7.0.2/config/LINUX.cf
--- condor-7.0.2.orig/config/LINUX.cf 2008-06-11 09:47:23.000000000 -0500
+++ condor-7.0.2/config/LINUX.cf 2008-06-11 09:49:18.000000000 -0500
@@ -42,6 +42,8 @@
# define GlibCFlag -DGLIBC=GLIBC -DGLIBC26=GLIBC26
# elif defined( IS_GLIBC27 )
# define GlibCFlag -DGLIBC=GLIBC -DGLIBC27=GLIBC27
+# elif defined( IS_GLIBC28 )
+# define GlibCFlag -DGLIBC=GLIBC -DGLIBC28=GLIBC28
# endif
#else /* Non IS_GLIBC */
# define GlibCFlag
better-analyze-everywhere.patch:
--- NEW FILE better-analyze-everywhere.patch ---
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 24542d2..3fb2c83 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -243,6 +243,38 @@ AC_DEFUN([MF_LIB_CHECK],
CFLAGS="$_cflags_save"])
[cv_ext_]m4_tolower($1)[=yes])])
+#
+## THIS SHOULD WORK, BUT DOESN'T! FOR SOME REASON AC_CHECK_HEADER DOES
+## NOT BEHAVE LIKE AC_CHECK_LIB
+#
+# MF_HEADER_CHECK(name,
+# header)
+#
+# This is a useful function that can be provided as a test to
+# CHECK_EXTERNAL. It checks for a header file to determine if the
+# external is available.
+#
+# Arguments:
+# * name: The externals name
+# * header: A header file to test for,
+# e.g. [classad/classad_distribution.h]
+#
+# Results:
+# * cv_ext_<name> set to yes, if the header is found
+# no, otherwise
+#
+# Note: This function uses _dir if it is set. It should be set to a
+# path that includes a lib/ and include/ directory.
+#
+AC_DEFUN([MF_HEADER_CHECK],
+ [_cflags_save="$CFLAGS"
+ AS_IF([test "x$_dir" != x],
+ [CFLAGS="$CFLAGS -I$_dir/include"])
+ AC_CHECK_HEADER([$2],
+ [cv_ext_]m4_tolower($1)[=yes],
+ [cv_ext_]m4_tolower($1)[=no
+ CFLAGS="$_cflags_save"
+ AC_MSG_WARN([$1: could not find $2])])])
#######################################################################
# CONDOR_EXTERNAL_VERSION written by Derek Wright
diff --git a/src/configure.ac b/src/configure.ac
index d20ca4d..599e277 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2392,7 +2392,10 @@ CHECK_EXTERNAL([zlib], [1.2.3], [$_cv_zlib_requirement],
[use zlib (provides compression support)],
MF_LIB_CHECK([zlib], [[z deflate]]))
-CHECK_EXTERNAL([classads], [1.0rc5], [soft])
+CHECK_EXTERNAL([classads], [1.0rc5], [soft],
+ [use new ClassAds (provides -better-analyze and more)],
+ # This REALLY should test for headers, like most checks...
+ MF_LIB_CHECK([classads], [[classad cclassad_create]]))
CHECK_EXTERNAL([srb], [3.2.1], [soft])
condor_config.generic.patch:
--- NEW FILE condor_config.generic.patch ---
diff --git a/src/condor_examples/condor_config.generic b/src/condor_examples/condor_config.generic
index c119679..e795a15 100644
--- a/src/condor_examples/condor_config.generic
+++ b/src/condor_examples/condor_config.generic
@@ -51,19 +51,16 @@
######################################################################
######################################################################
-## What machine is your central manager?
-CONDOR_HOST = central-manager-hostname.your.domain
-
##--------------------------------------------------------------------
## Pathnames:
##--------------------------------------------------------------------
## Where have you installed the bin, sbin and lib condor directories?
-RELEASE_DIR = /usr/local/condor
+RELEASE_DIR = /usr
## Where is the local condor directory for each host?
## This is where the local config file(s), logs and
## spool/execute directories are located
-LOCAL_DIR = $(TILDE)
+LOCAL_DIR = /var/lib/condor
#LOCAL_DIR = $(RELEASE_DIR)/hosts/$(HOSTNAME)
## Where is the machine-specific local config file for each host?
@@ -93,13 +90,13 @@ MAIL = /usr/bin/mail
## machines don't share a common UID space, set it to
## UID_DOMAIN = $(FULL_HOSTNAME)
## to specify that each machine has its own UID space.
-UID_DOMAIN = your.domain
+UID_DOMAIN = $(FULL_HOSTNAME)
## Internet domain of machines sharing a common file system.
## If your machines don't use a network file system, set it to
## FILESYSTEM_DOMAIN = $(FULL_HOSTNAME)
## to specify that each machine has its own file system.
-FILESYSTEM_DOMAIN = your.domain
+FILESYSTEM_DOMAIN = $(FULL_HOSTNAME)
## This macro is used to specify a short description of your pool.
## It should be about 20 characters long. For example, the name of
@@ -218,7 +215,7 @@ HOSTALLOW_READ = *
## HOSTALLOW_WRITE = *
## but note that this will allow anyone to submit jobs or add
## machines to your pool and is serious security risk.
-HOSTALLOW_WRITE = YOU_MUST_CHANGE_THIS_INVALID_CONDOR_CONFIGURATION_VALUE
+HOSTALLOW_WRITE = $(FULL_HOSTNAME)
#HOSTALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain
#HOSTDENY_WRITE = bad-machine.your.domain
@@ -859,10 +856,10 @@ LOG = $(LOCAL_DIR)/log
SPOOL = $(LOCAL_DIR)/spool
EXECUTE = $(LOCAL_DIR)/execute
BIN = $(RELEASE_DIR)/bin
-LIB = $(RELEASE_DIR)/lib
-INCLUDE = $(RELEASE_DIR)/include
+LIB = $(RELEASE_DIR)/share/condor
+INCLUDE = $(RELEASE_DIR)/include/condor
SBIN = $(RELEASE_DIR)/sbin
-LIBEXEC = $(RELEASE_DIR)/libexec
+LIBEXEC = $(RELEASE_DIR)/libexec/condor
## If you leave HISTORY undefined (comment it out), no history file
## will be created.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 11 Feb 2008 19:57:27 -0000 1.2
+++ .cvsignore 6 Aug 2008 15:04:10 -0000 1.3
@@ -1 +1 @@
-condor-7.0.0-72173-1-RH.tar.gz
+condor-7.0.4-95033-RH.tar.gz
--- f9_gcc_detection.patch DELETED ---
--- f9_glibc_detection.patch DELETED ---
--- isolate-gsoap-linking.patch DELETED ---
--- lsb_init.patch DELETED ---
More information about the fedora-extras-commits
mailing list