Revision: 69602
http://trac.macports.org/changeset/69602
Author: jmr at macports.org
Date: 2010-07-10 14:03:43 -0700 (Sat, 10 Jul 2010)
Log Message:
-----------
ncbi_tools: disable carbon when building for 64-bit archs (#22621)
Modified Paths:
--------------
trunk/dports/science/ncbi_tools/Portfile
Added Paths:
-----------
trunk/dports/science/ncbi_tools/files/c-toolkit-no-carbon.patch
Modified: trunk/dports/science/ncbi_tools/Portfile
===================================================================
--- trunk/dports/science/ncbi_tools/Portfile 2010-07-10 20:54:17 UTC (rev 69601)
+++ trunk/dports/science/ncbi_tools/Portfile 2010-07-10 21:03:43 UTC (rev 69602)
@@ -17,6 +17,9 @@
extract.mkdir yes
patchfiles darwin.ncbi.mk.diff
+if {[string match *64* $build_arch]} {
+ patchfiles-append c-toolkit-no-carbon.patch
+}
use_configure no
use_parallel_build no
Added: trunk/dports/science/ncbi_tools/files/c-toolkit-no-carbon.patch
===================================================================
--- trunk/dports/science/ncbi_tools/files/c-toolkit-no-carbon.patch (rev 0)
+++ trunk/dports/science/ncbi_tools/files/c-toolkit-no-carbon.patch 2010-07-10 21:03:43 UTC (rev 69602)
@@ -0,0 +1,60 @@
+--- ncbi/corelib/ncbienv.c 17 Aug 2009 19:56:13 -0000
++++ ncbi/corelib/ncbienv.c 9 Nov 2009 18:44:01 -0000
+@@ -1938,7 +1938,7 @@
+ static char **targv = NULL;
+
+
+-#if defined(WIN_MAC)
++#if defined(WIN_MAC) || defined(OS_UNIX_DARWIN)
+ static FSSpec apFileSpec;
+ static Str255 apName;
+ static Handle apParam;
+@@ -2053,7 +2053,7 @@
+ }
+ }
+ #endif /* defined(OS_UNIX_DARWIN) */
+-#endif /* defined(WIN_MAC) */
++#endif /* defined(WIN_MAC) || defined(OS_UNIX_DARWIN) */
+
+
+ #if defined(OS_MSWIN) || defined(OS_VMS)
+@@ -2244,7 +2244,7 @@
+ {
+ NlmMutexLockEx( &corelibMutex );
+ wasSetup = TRUE;
+-#if defined(WIN_MAC)
++#if defined(WIN_MAC) || defined(OS_UNIX_DARWIN)
+ wasSetup = Nlm_SetupArguments_ST_Mac();
+ #elif defined(OS_UNIX)
+ {{
+@@ -2424,7 +2424,7 @@
+ int mib [2];
+ Nlm_Char model [32];
+ #endif
+- long sysVer;
++ Nlm_Int4 sysVer;
+ #endif
+ Nlm_CharPtr str = "unknown";
+
+--- ncbi/corelib/ncbiwin.h 24 Nov 2006 20:05:36 -0000
++++ ncbi/corelib/ncbiwin.h 9 Nov 2009 18:44:01 -0000
+@@ -168,6 +168,8 @@
+ #include <Sound.h>
+ #include <Folders.h>
+ #endif
++#elif defined(OS_UNIX_DARWIN)
++#include <CoreServices/CoreServices.h>
+ #endif
+
+ /* used in ncbifile.c *****/
+--- ncbi/make/makedis.csh 23 Mar 2009 17:10:14 -0000
++++ ncbi/make/makedis.csh 9 Nov 2009 18:44:01 -0000
+@@ -240,7 +240,7 @@
+ endif
+ endif
+ set HAVE_MOTIF=0
+- set HAVE_MAC=1
++ # set HAVE_MAC=1
+ breaksw
+ case NetBSD:
+ set platform=netbsd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100710/597f62f1/attachment.html>