Ticket #1116: 0005-Fix-autotools-build-with-recent-OS-X-versions.patch

client/Makefile.am

@@ -19 +19 @@
 LIBS += $(CLIENTLIBS)
 
 if OS_DARWIN
-   LIBS += -framework IOKit -framework Foundation -framework ScreenSaver -framework Cocoa
+   LIBS += -framework IOKit -framework Foundation -framework ScreenSaver -framework Cocoa -framework CoreServices
 endif
 
 bin_PROGRAMS = boinc_client switcher boinccmd
 
 boinccmd_SOURCES = boinc_cmd.cpp
-boinccmd_DEPENDENCIES = $(LIBBOINC) 
+boinccmd_DEPENDENCIES = $(LIBBOINC)
 boinccmd_CPPFLAGS = $(AM_CPPFLAGS)
-boinccmd_LDFLAGS = $(AM_LDFLAGS) -L../lib 
+boinccmd_LDFLAGS = $(AM_LDFLAGS) -L../lib
 boinccmd_LDADD = $(LIBBOINC) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
 
 boinc_client_SOURCES = \
@@ -79 +79 @@
 
 boinc_client_DEPENDENCIES = $(LIBBOINC)
 boinc_client_CPPFLAGS = $(AM_CPPFLAGS)
-boinc_client_LDFLAGS = $(AM_LDFLAGS) -L../lib 
-boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS) 
+boinc_client_LDFLAGS = $(AM_LDFLAGS) -L../lib
+if OS_DARWIN
+boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
+endif
+boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
 
 boinc_clientdir = $(bindir)
 
 switcher_SOURCES = switcher.cpp
-switcher_LDFLAGS = $(AM_LDFLAGS) -L../lib 
+switcher_LDFLAGS = $(AM_LDFLAGS) -L../lib
 switcher_LDADD = $(LIBBOINC)
 
 ## since we are using libtool we need some magic to get boinc and boinc_client

client/cs_platforms.cpp

@@ -40 +40 @@
 #endif
 #endif
 
+#if defined(__APPLE__) && (defined(__i386__) || defined(__x86_64__))
+#include <CoreServices/CoreServices.h>
+#include <sys/sysctl.h>
+#endif
+
+
+
 #include "client_types.h"
 #include "client_state.h"
 #include "error_numbers.h"
@@ -49 +56 @@
 #include "str_replace.h"
 #include "util.h"
 
-#if (defined (__APPLE__) && (defined(__i386__) || defined(__x86_64__)))
-#include <sys/sysctl.h>
-#include <Carbon/Carbon.h>
-
-char *HOSTTYPE = "";
-#endif
-
 // return the primary platform id.
 //
 const char* CLIENT_STATE::get_primary_platform() {
@@ -109 +109 @@
     err = Gestalt(gestaltSystemVersion, &version);
     retval = sysctlbyname("hw.optional.x86_64", &response, &len, NULL, 0);
     if ((err == noErr) && (version >= 0x1050) && response && (!retval)) {
-        HOSTTYPE = "x86_64-apple-darwin";
         add_platform("x86_64-apple-darwin");
-    } else {
-        HOSTTYPE = "i686-apple-darwin";
     }
 
     // Supported on both Mac Intel architectures
     add_platform("i686-apple-darwin");
 #else
-    // We no longer request PowerPC applications on Intel Macs 
-    // because all projects supporting Macs should have Intel 
-    // applications by now, and PowerPC emulation ("Rosetta") 
+    // We no longer request PowerPC applications on Intel Macs
+    // because all projects supporting Macs should have Intel
+    // applications by now, and PowerPC emulation ("Rosetta")
     // is not always supported in newer versions of OS X.
     add_platform("powerpc-apple-darwin");
 #endif

client/hostinfo_unix.cpp

@@ -16 +16 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 // There is a reason that having a file called "cpp.h" that includes config.h
-// and some of the C++ header files is bad.  That reason is because there are 
-// #defines that alter the behiour of the standard C and C++ headers.  In 
-// this case we need to use the "small files" environment on some unix 
+// and some of the C++ header files is bad.  That reason is because there are
+// #defines that alter the behiour of the standard C and C++ headers.  In
+// this case we need to use the "small files" environment on some unix
 // systems.  That can't be done if we include "cpp.h"
 
-// copied directly from cpp.h
-#if defined(_WIN32) && !defined(__CYGWIN32__)
-
-#if defined(_WIN64) && defined(_M_X64)
-#define HOSTTYPE    "windows_x86_64"
-#define HOSTTYPEALT "windows_intelx86"
-#else
-#define HOSTTYPE "windows_intelx86"
-#endif
-
 #include "version.h"         // version numbers from autoconf
-#endif
 
+#include "cpp.h"
 #include "config.h"
 
 #if !defined(_WIN32) || defined(__CYGWIN32__)
 
 // Access to binary files in /proc filesystem doesn't work in the 64bit
-// files environment on some systems.  None of the functions here need 
+// files environment on some systems.  None of the functions here need
 // 64bit file functions, so we'll undefine _FILE_OFFSET_BITS and _LARGE_FILES.
 #undef _FILE_OFFSET_BITS
 #undef _LARGE_FILES
@@ -110 +100 @@
 #include "client_types.h"
 #include "client_msgs.h"
 #include "hostinfo_network.h"
+#include "hostinfo.h"
 
 using std::string;
 
 #ifdef __APPLE__
+#include <IOKit/IOKitLib.h>
 #include <Carbon/Carbon.h>
 #include <CoreFoundation/CoreFoundation.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -208 +201 @@
     CFStringRef psState;
     int i;
     bool retval = false;
-  
+
     CFTypeRef blob = IOPSCopyPowerSourcesInfo();
     CFArrayRef list = IOPSCopyPowerSourcesList(blob);
 
@@ -637 +630 @@
 #if defined(__i386__) || defined(__x86_64__)
     char brand_string[256];
     int family, stepping, model;
-    
+
     len = sizeof(host.p_vendor);
     sysctlbyname("machdep.cpu.vendor", host.p_vendor, &len, NULL, 0);
 
@@ -658 +651 @@
 
     snprintf(
         host.p_model, sizeof(host.p_model),
-        "%s [x86 Family %d Model %d Stepping %d]", 
+        "%s [x86 Family %d Model %d Stepping %d]",
         brand_string, family, model, stepping
     );
 #else       // PowerPC
@@ -670 +663 @@
     if (response && (!retval)) {
         safe_strcpy(host.p_features, "AltiVec");
     }
-        
+
     len = sizeof(model);
     sysctlbyname("hw.model", model, &len, NULL, 0);
 
@@ -703 +696 @@
     cpuid_info cpuInfo;
     int32 maxStandardFunction;
     int32 maxExtendedFunction = 0;
-    
+
     char brand_string[256];
 
     if (get_system_info(&sys_info) != B_OK) {
@@ -718 +711 @@
 
     snprintf(host.p_vendor, sizeof(host.p_vendor), "%.12s",
         cpuInfo.eax_0.vendor_id);
-    
+
     maxStandardFunction = cpuInfo.eax_0.max_eax;
     if (maxStandardFunction >= 500)
         maxStandardFunction = 0; /* old Pentium sample chips has
@@ -855 +848 @@
 
     total_received = 0;
     total_sent = 0;
-    
+
     if (sysctl(mib, 6, NULL, &currentSize, NULL, 0) != 0) return errno;
     if (!sysctlBuffer || (currentSize > sysctlBufferSize)) {
         if (sysctlBuffer) free(sysctlBuffer);
@@ -996 +989 @@
     return kIOReturnSuccess;
 }
 
-
 kern_return_t SMCReadKey(UInt32 key, SMCBytes_t val) {
     kern_return_t       result;
     SMCKeyData_t        inputStructure;
     SMCKeyData_t        outputStructure;
-     size_t              structureInputSize;
-    size_t              structureOutputSize;
+    size_t              structureOutputSize = 0;
 
-    memset(&inputStructure, 0, sizeof(SMCKeyData_t));
-    memset(&outputStructure, 0, sizeof(SMCKeyData_t));
+    memset(&inputStructure, 0, sizeof(inputStructure));
+    memset(&outputStructure, 0, sizeof(outputStructure));
     memset(val, 0, sizeof(val));
 
     inputStructure.key = key;
-    inputStructure.data8 = SMC_CMD_READ_KEYINFO;    
-
-    structureInputSize = sizeof(inputStructure);
-    structureOutputSize = sizeof(outputStructure);
-    result = IOConnectMethodStructureIStructureO(
-        conn, KERNEL_INDEX_SMC, structureInputSize, &structureOutputSize, 
-        &inputStructure, &outputStructure
-    );
+    inputStructure.data8 = SMC_CMD_READ_KEYINFO;
+
+#if MAC_OS_X_VERSION_10_5
+    result = IOConnectCallStructMethod(conn,
+                                       KERNEL_INDEX_SMC,
+                                       &inputStructure,
+                                       sizeof(inputStructure),
+                                       &inputStructure,
+                                       &structureOutputSize);
+#else
+    result = IOConnectMethodStructureIStructureO(conn,
+                                                 KERNEL_INDEX_SMC,
+                                                 sizeof(inputStructure),
+                                                 &structureOutputSize,
+                                                 &inputStructure,
+                                                 &outputStructure);
+#endif
     if (result != kIOReturnSuccess) {
         return result;
     }
@@ -1024 +1024 @@
     inputStructure.keyInfo.dataSize = outputStructure.keyInfo.dataSize;
     inputStructure.data8 = SMC_CMD_READ_BYTES;
 
+#if MAC_OS_X_VERSION_10_5
+    result = IOConnectCallStructMethod(conn,
+                                       KERNEL_INDEX_SMC,
+                                       &inputStructure,
+                                       sizeof(inputStructure),
+                                       &inputStructure,
+                                       &structureOutputSize);
+#else
     result = IOConnectMethodStructureIStructureO(
-        conn, KERNEL_INDEX_SMC, structureInputSize, &structureOutputSize, 
+        conn, KERNEL_INDEX_SMC, sizeof(inputStructure), &structureOutputSize),
         &inputStructure, &outputStructure
     );
-    if (result != kIOReturnSuccess)
+#endif
+    if (result != kIOReturnSuccess) {
         return result;
+    }
 
     memcpy(val, outputStructure.bytes, sizeof(outputStructure.bytes));