[Condor-devel] Fwd: FreeBSD 64-bit Patches

[Andy Pavlo <pavlo@xxxxxxxxxxx>]

----------  Forwarded Message  ----------

Subject: FreeBSD 64-bit Patches
Date: Friday 25 January 2008 15:00
From: Andy Pavlo <Andrew_Pavlo@xxxxxxxxx>
To: psilord@xxxxxxxxxxx
Cc: Todd Tannenbaum <tannenba@xxxxxxxxxxx>

Beard Man,

Here are the patches that we discussed today. These should replace all the
ones that I sent last night. Thanks!
--
Andy Pavlo
Andrew_Pavlo@xxxxxxxxx

-------------------------------------------------------

-- 
Andy Pavlo
pavlo@xxxxxxxxxxx

--- ../externals/bundles/krb5/1.4.3/build_krb5-1.4.3.orig	Wed Jan 23 16:39:33 2008
+++ ../externals/bundles/krb5/1.4.3/build_krb5-1.4.3	Wed Jan 23 16:42:39 2008
@@ -24,8 +24,8 @@
 
 # FreeBSD patches
 if [ `uname` = "FreeBSD" ]; then
-  patch -p < $PACKAGE_BUILD_DIR/makefile1.freebsd.patch
   patch -p < $PACKAGE_BUILD_DIR/makefile2.freebsd.patch
+  find ./ -name "Makefile" | xargs perl -pi -e 's/(^CFLAGS = .*$)/$1 \-DEAI_NODATA=EAI_NONAME/g'
 fi
 
 make

--- ../externals/bundles/gsoap/2.7.6c-p2/build_gsoap-2.7.6c-p2.orig	2007-09-19 15:06:58.000000000 -0400
+++ ../externals/bundles/gsoap/2.7.6c-p2/build_gsoap-2.7.6c-p2	2008-01-24 11:58:23.000000000 -0500
@@ -107,6 +107,14 @@
 cd ..  && echo Changed directory to `pwd`
 cd ..  && echo Changed directory to `pwd`
 
+##
+## FreeBSD Patch
+## Fixes gethostbyname_r
+##
+if [ `uname` = "FreeBSD" ]; then
+   perl -pi -e 's/host = (gethostbyname_r\(.*, SOAP_BUFLEN,) (&soap->errnum\);)/$1 &host, $2/g' soapcpp2/stdsoap2.c*
+fi
+
 make
 if [ $? -ne 0 ]
 then

--- ./condor_scripts/make_final_tarballs.orig	2008-01-24 11:35:58.000000000 -0500
+++ ./condor_scripts/make_final_tarballs	2008-01-24 11:36:37.000000000 -0500
@@ -262,7 +262,8 @@
   "ppc_aix52"	  => "aix5.2",
   "i386_freebsd4" => "freebsd4",
   "i386_freebsd5" => "freebsd5",
-  "i386_freebsd6" => "freebsd6"
+  "i386_freebsd6" => "freebsd6",
+  "i386_freebsd7" => "freebsd7"
 );
 
 my %archname = (
@@ -308,7 +309,8 @@
   "ppc_aix52"	  => "aix",
   "i386_freebsd4" => "x86",
   "i386_freebsd5" => "x86",
-  "i386_freebsd6" => "x86"
+  "i386_freebsd6" => "x86",
+  "i386_freebsd7" => "x86"
 );
 
 

--- condor_sysapi/arch.c.orig	2008-01-25 13:36:45.000000000 -0500
+++ condor_sysapi/arch.c	2008-01-25 13:38:45.000000000 -0500
@@ -201,6 +201,13 @@
 	else if( !strcmp(machine, "x86_64") ) {
 		sprintf( tmp, "X86_64" );
 	}
+	//
+	// FreeBSD 64-bit reports themselves as "amd64"
+	// Andy - 01/25/2008
+	//
+	else if( !strcmp(machine, "amd64") ) {
+		sprintf( tmp, "X86_64" );
+	}
 	else if( !strncmp( sysname, "IRIX", 4 ) ) {
 		sprintf( tmp, "SGI" );
 	} 

--- ./configure.ac.orig	2008-01-22 17:27:40.000000000 -0500
+++ ./configure.ac	2008-01-25 12:13:08.000000000 -0500
@@ -387,8 +387,14 @@
       _cv_arch="IA64"
    elif test $arch = "ppc" -o $arch = "ppc64" ; then
       _cv_arch="CONDOR_PPC"
-   elif test $arch = "x86_64" ; then
-      _cv_arch="X86_64"
+   ##
+   ## Globus does not work on 64-bit
+   ## We will use the i386 build until this gets fixed (hopefully not by me!)
+   ## Andy - 01/25/2008
+   ##
+   elif test $arch = "amd64" -o $arch = "x86_64" ; then
+      _cv_arch="I386"
+      #_cv_arch="X86_64"
    fi
 
    ##
@@ -840,6 +846,12 @@
     CompilerMinor="1"
     CompilerPatch="2"
     ;;
+ "4.2.1" )
+    CompilerKind="GCC"
+    CompilerMajor="4"
+    CompilerMinor="2"
+    CompilerPatch="1"
+    ;;
  * )
    AC_MSG_RESULT([ERROR])
    AC_MSG_ERROR([Condor will not compile with gcc version $gcc_vers])