[78502] trunk/dports/lang

jmr at macports.org jmr at macports.org
Tue May 10 00:19:08 PDT 2011


Revision: 78502
          http://trac.macports.org/changeset/78502
Author:   jmr at macports.org
Date:     2011-05-10 00:19:08 -0700 (Tue, 10 May 2011)
Log Message:
-----------
python24, python25: fix build_arch and universal support (#21248), consolidate some patches

Modified Paths:
--------------
    trunk/dports/lang/python24/Portfile
    trunk/dports/lang/python24/files/patch-configure
    trunk/dports/lang/python25/Portfile
    trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff
    trunk/dports/lang/python25/files/patch-configure.diff

Added Paths:
-----------
    trunk/dports/lang/python24/files/pyconfig.h-universal.ed
    trunk/dports/lang/python25/files/pyconfig.h-universal.ed

Removed Paths:
-------------
    trunk/dports/lang/python24/files/patch-configure-arch_only.diff
    trunk/dports/lang/python24/files/patch-configure-badcflags.diff
    trunk/dports/lang/python25/files/patch-configure-arch_only.diff
    trunk/dports/lang/python25/files/patch-configure-badcflags.diff

Modified: trunk/dports/lang/python24/Portfile
===================================================================
--- trunk/dports/lang/python24/Portfile	2011-05-10 07:18:38 UTC (rev 78501)
+++ trunk/dports/lang/python24/Portfile	2011-05-10 07:19:08 UTC (rev 78502)
@@ -37,9 +37,7 @@
                         patch-Include-pyport.h \
                         patch-Mac-OSX-Makefile.in \
                         patch-Mac-OSX-IDLE-Makefile.in \
-                        patch-Mac-OSX-PythonLauncher-Makefile.in \
-                        patch-configure-badcflags.diff \
-                        patch-configure-arch_only.diff
+                        patch-Mac-OSX-PythonLauncher-Makefile.in
 
 depends_lib             port:gettext port:openssl
 
@@ -62,6 +60,9 @@
         ${worksrcpath}/Mac/OSX/IDLE/Makefile.in \
         ${worksrcpath}/Mac/OSX/Makefile.in \
         ${worksrcpath}/Mac/OSX/PythonLauncher/Makefile.in
+    reinplace "s|__BUILD_ARCH__|${build_arch}|" ${worksrcpath}/configure
+    reinplace "s|__UNIVERSAL_CFLAGS__|${configure.universal_cflags}|" ${worksrcpath}/configure
+    reinplace "s|__UNIVERSAL_LDFLAGS__|${configure.universal_ldflags}|" ${worksrcpath}/configure
 }
 
 build.target            all
@@ -190,14 +191,15 @@
     }
 }
 
-configure.universal_archs i386 ppc
-
 variant universal {
    if {${configure.sdkroot} != ""} {
       configure.args-append   --enable-universalsdk=${configure.sdkroot}
    } else {
       configure.args-append   --enable-universalsdk=/
    }
+   post-configure {
+      system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
+   }
 }
 
 livecheck.type          regex

Modified: trunk/dports/lang/python24/files/patch-configure
===================================================================
--- trunk/dports/lang/python24/files/patch-configure	2011-05-10 07:18:38 UTC (rev 78501)
+++ trunk/dports/lang/python24/files/patch-configure	2011-05-10 07:19:08 UTC (rev 78502)
@@ -1,25 +1,50 @@
---- configure.orig	2007-04-05 21:32:57.000000000 -0700
-+++ configure	2007-04-05 21:32:59.000000000 -0700
-@@ -3907,7 +3907,12 @@
+--- configure.orig	2006-10-18 02:03:36.000000000 +1000
++++ configure	2011-05-10 15:15:25.000000000 +1000
+@@ -3907,9 +3907,16 @@
  	    ;;
  	# is there any other compiler on Darwin besides gcc?
  	Darwin*)
 -	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
 +	    if [[ `/usr/bin/arch` = 'ppc' ]]
 +        then
-+          BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common"
++          BASECFLAGS="$BASECFLAGS -mno-fused-madd -fno-common"
 +        else
-+          BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common"
++          BASECFLAGS="$BASECFLAGS -fno-common"
 +        fi
  	    if test "${enable_universalsdk}"; then
- 		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
+-		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
++		BASECFLAGS="__UNIVERSAL_CFLAGS__ -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
++	    else
++	    BASECFLAGS="-arch __BUILD_ARCH__ ${BASECFLAGS}"
  	    fi
-@@ -10328,7 +10333,7 @@
+ 
+ 	    ;;
+@@ -10316,7 +10323,7 @@
+   Darwin/[01234567].*)
+     LIBTOOL_CRUFT="-framework System -lcc_dynamic"
+     if test -z "${enable_universalsdk}"; then
+-	    LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
++	    LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only __BUILD_ARCH__"
+     fi
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+@@ -10328,7 +10335,7 @@
          else
              LIBTOOL_CRUFT=""
      fi
 -    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -lSystem -lSystemStubs -arch_only ppc'
-+    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -lSystem -lSystemStubs -arch_only '`/usr/bin/arch`
++    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -lSystem -lSystemStubs -arch_only __BUILD_ARCH__'
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
  esac
+@@ -10460,7 +10467,9 @@
+ 		if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
+ 		then
+ 			if test "${enable_universalsdk}"; then
+-				LDFLAGS="-arch i386 -arch ppc -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++				LDFLAGS="__UNIVERSAL_LDFLAGS__ -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++			else
++				LDFLAGS="-arch __BUILD_ARCH__ ${LDFLAGS}"
+ 			fi
+ 			LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
+ 			BLDSHARED="$LDSHARED"

Deleted: trunk/dports/lang/python24/files/patch-configure-arch_only.diff
===================================================================
--- trunk/dports/lang/python24/files/patch-configure-arch_only.diff	2011-05-10 07:18:38 UTC (rev 78501)
+++ trunk/dports/lang/python24/files/patch-configure-arch_only.diff	2011-05-10 07:19:08 UTC (rev 78502)
@@ -1,20 +0,0 @@
---- configure.orig	2009-08-31 01:54:27.000000000 +1000
-+++ configure	2009-08-31 01:55:24.000000000 +1000
-@@ -10321,7 +10321,7 @@
-   Darwin/[01234567].*)
-     LIBTOOL_CRUFT="-framework System -lcc_dynamic"
-     if test -z "${enable_universalsdk}"; then
--	    LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
-+	    LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
-     fi
-     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
-@@ -10333,7 +10333,7 @@
-         else
-             LIBTOOL_CRUFT=""
-     fi
--    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -lSystem -lSystemStubs -arch_only '`/usr/bin/arch`
-+    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -lSystem -lSystemStubs'
-     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
- esac

Deleted: trunk/dports/lang/python24/files/patch-configure-badcflags.diff
===================================================================
--- trunk/dports/lang/python24/files/patch-configure-badcflags.diff	2011-05-10 07:18:38 UTC (rev 78501)
+++ trunk/dports/lang/python24/files/patch-configure-badcflags.diff	2011-05-10 07:19:08 UTC (rev 78502)
@@ -1,14 +0,0 @@
---- configure.orig	2009-08-31 01:29:04.000000000 +1000
-+++ configure	2009-08-31 01:30:05.000000000 +1000
-@@ -3909,9 +3909,9 @@
- 	Darwin*)
- 	    if [[ `/usr/bin/arch` = 'ppc' ]]
-         then
--          BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common"
-+          BASECFLAGS="$BASECFLAGS -mno-fused-madd -fno-common"
-         else
--          BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common"
-+          BASECFLAGS="$BASECFLAGS -fno-common"
-         fi
- 	    if test "${enable_universalsdk}"; then
- 		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"

Added: trunk/dports/lang/python24/files/pyconfig.h-universal.ed
===================================================================
--- trunk/dports/lang/python24/files/pyconfig.h-universal.ed	                        (rev 0)
+++ trunk/dports/lang/python24/files/pyconfig.h-universal.ed	2011-05-10 07:19:08 UTC (rev 78502)
@@ -0,0 +1,43 @@
+/HAVE_LARGEFILE_SUPPORT/c
+#ifdef __LP64__
+/* #undef HAVE_LARGEFILE_SUPPORT */
+#else
+#define HAVE_LARGEFILE_SUPPORT 1
+#endif
+.
+/SIZEOF_LONG/c
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+/SIZEOF_PTHREAD_T/c
+#ifdef __LP64__
+#define SIZEOF_PTHREAD_T 8
+#else
+#define SIZEOF_PTHREAD_T 4
+#endif
+.
+/SIZEOF_TIME_T/c
+#ifdef __LP64__
+#define SIZEOF_TIME_T 8
+#else
+#define SIZEOF_TIME_T 4
+#endif
+.
+/SIZEOF_UINTPTR_T/c
+#ifdef __LP64__
+#define SIZEOF_UINTPTR_T 8
+#else
+#define SIZEOF_UINTPTR_T 4
+#endif
+.
+/SIZEOF_VOID_P/c
+#ifdef __LP64__
+#define SIZEOF_VOID_P 8
+#else
+#define SIZEOF_VOID_P 4
+#endif
+.
+w

Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile	2011-05-10 07:18:38 UTC (rev 78501)
+++ trunk/dports/lang/python25/Portfile	2011-05-10 07:19:08 UTC (rev 78502)
@@ -32,8 +32,7 @@
                         patch-Lib-cgi.py.diff \
                         patch-Lib-distutils-dist.py.diff \
                         patch-setup.py.diff \
-                        patch-configure-badcflags.diff \
-                        patch-configure-arch_only.diff \
+                        patch-configure.diff \
                         patch-64bit.diff
 
 depends_lib             port:gettext port:zlib port:openssl port:tk \
@@ -57,6 +56,11 @@
                 ${worksrcpath}/Mac/BuildScript/build-installer.py
         reinplace "s|xargs -0 rm -r|xargs -0 rm -rf|g" \
                 ${worksrcpath}/Mac/PythonLauncher/Makefile.in
+        reinplace "s|__BUILD_ARCH__|${build_arch}|" ${worksrcpath}/configure
+        reinplace "s|__UNIVERSAL_CFLAGS__|${configure.universal_cflags}|" ${worksrcpath}/configure
+        reinplace "s|__UNIVERSAL_LDFLAGS__|${configure.universal_ldflags}|" \
+            ${worksrcpath}/configure \
+            ${worksrcpath}/Makefile.pre.in
 
         # http://trac.macports.org/ticket/21517
         system "cd ${worksrcpath} && ed - Modules/_localemodule.c < ${filespath}/_localemodule.c.ed"
@@ -185,14 +189,15 @@
 }
 }
 
-configure.universal_archs i386 ppc
-
 variant universal {
    if {${configure.sdkroot} == ""} {
       configure.args-append   --enable-universalsdk=/
    } else {
       configure.args-append   --enable-universalsdk=${configure.sdkroot}
    }
+   post-configure {
+      system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
+   }
 }
 
 livecheck.type          regex

Modified: trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff
===================================================================
--- trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff	2011-05-10 07:18:38 UTC (rev 78501)
+++ trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff	2011-05-10 07:19:08 UTC (rev 78502)
@@ -1,5 +1,5 @@
---- Makefile.pre.in.orig	2007-12-05 13:43:57.000000000 -0700
-+++ Makefile.pre.in	2008-07-25 21:41:02.000000000 -0600
+--- Makefile.pre.in.orig	2008-09-22 10:22:44.000000000 +1000
++++ Makefile.pre.in	2011-05-10 16:46:43.000000000 +1000
 @@ -348,8 +348,8 @@
  # Build the shared modules
  sharedmods: $(BUILDPYTHON)
@@ -11,7 +11,16 @@
  	esac
  
  # Build static library
-@@ -894,7 +904,7 @@
+@@ -387,7 +387,7 @@
+                 $(RESSRCDIR)/English.lproj/InfoPlist.strings
+ 	$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
+ 	if test "${UNIVERSALSDK}"; then \
+-		$(CC) -o $(LDLIBRARY) -arch i386 -arch ppc -dynamiclib \
++		$(CC) -o $(LDLIBRARY) __UNIVERSAL_LDFLAGS__ -dynamiclib \
+ 			-isysroot "${UNIVERSALSDK}" \
+ 			-all_load $(LIBRARY) -Wl,-single_module \
+ 			-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python \
+@@ -894,7 +894,7 @@
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall:
@@ -20,7 +29,7 @@
  	   	--prefix=$(prefix) \
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
-@@ -968,7 +978,7 @@
+@@ -968,7 +968,7 @@
  # This installs a few of the useful scripts in Tools/scripts
  scriptsinstall:
  	SRCDIR=$(srcdir) $(RUNSHARED) \

Deleted: trunk/dports/lang/python25/files/patch-configure-arch_only.diff
===================================================================
--- trunk/dports/lang/python25/files/patch-configure-arch_only.diff	2011-05-10 07:18:38 UTC (rev 78501)
+++ trunk/dports/lang/python25/files/patch-configure-arch_only.diff	2011-05-10 07:19:08 UTC (rev 78502)
@@ -1,20 +0,0 @@
---- configure.orig	2009-06-24 13:57:38.000000000 -0700
-+++ configure	2009-06-24 13:58:38.000000000 -0700
-@@ -11362,7 +11362,7 @@
-     if test "${enable_universalsdk}"; then
- 	    :
-     else
--	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
-+	LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
-     fi
-     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
-@@ -11374,7 +11374,7 @@
-         else
-             LIBTOOL_CRUFT=""
-     fi
--    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
-+    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
-     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
- esac

Deleted: trunk/dports/lang/python25/files/patch-configure-badcflags.diff
===================================================================
--- trunk/dports/lang/python25/files/patch-configure-badcflags.diff	2011-05-10 07:18:38 UTC (rev 78501)
+++ trunk/dports/lang/python25/files/patch-configure-badcflags.diff	2011-05-10 07:19:08 UTC (rev 78502)
@@ -1,11 +0,0 @@
---- configure.orig	2008-10-15 18:00:59.000000000 -0700
-+++ configure	2008-10-15 18:02:47.000000000 -0700
-@@ -4538,7 +4538,7 @@
- 	    ;;
- 	# is there any other compiler on Darwin besides gcc?
- 	Darwin*)
--	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
-+	    BASECFLAGS="$BASECFLAGS -mno-fused-madd"
- 	    if test "${enable_universalsdk}"; then
- 		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
- 	    fi

Modified: trunk/dports/lang/python25/files/patch-configure.diff
===================================================================
--- trunk/dports/lang/python25/files/patch-configure.diff	2011-05-10 07:18:38 UTC (rev 78501)
+++ trunk/dports/lang/python25/files/patch-configure.diff	2011-05-10 07:19:08 UTC (rev 78502)
@@ -1,28 +1,45 @@
---- configure.in.orig	2007-09-28 21:07:32.000000000 +0200
-+++ configure.in	2007-09-28 21:08:12.000000000 +0200
-@@ -669,6 +669,11 @@
- 	  BLDLIBRARY='-L. -lpython$(VERSION)'
- 	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
- 	  ;;
-+	Darwin*)
-+	  LDLIBRARY='libpython$(VERSION).dylib'
-+	  BLDLIBRARY='-L. -lpython$(VERSION)'
-+	  RUNSHARED=DYLD_LIBRARY_PATH="`pwd`:${DYLD_LIBRARY_PATH}"
-+	  ;;
-   esac
- else # shared is disabled
-   case $ac_sys_system in
---- configure.orig	2007-09-28 21:07:26.000000000 +0200
-+++ configure	2007-09-28 21:07:33.000000000 +0200
-@@ -3445,6 +3445,11 @@
- 	  BLDLIBRARY='-L. -lpython$(VERSION)'
- 	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
- 	  ;;
-+	Darwin*)
-+	  LDLIBRARY='libpython$(VERSION).dylib'
-+	  BLDLIBRARY='-L. -lpython$(VERSION)'
-+	  RUNSHARED=DYLD_LIBRARY_PATH="`pwd`:${DYLD_LIBRARY_PATH}"
-+	  ;;
-   esac
- else # shared is disabled
-   case $ac_sys_system in
+--- configure.orig	2008-12-14 01:13:52.000000000 +1100
++++ configure	2011-05-10 16:25:02.000000000 +1000
+@@ -4534,9 +4534,11 @@
+ 	    ;;
+ 	# is there any other compiler on Darwin besides gcc?
+ 	Darwin*)
+-	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
++	    BASECFLAGS="$BASECFLAGS -mno-fused-madd"
+ 	    if test "${enable_universalsdk}"; then
+-		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
++		BASECFLAGS="__UNIVERSAL_CFLAGS__ -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
++	    else
++		BASECFLAGS="-arch __BUILD_ARCH__ ${BASECFLAGS}"
+ 	    fi
+ 
+ 	    ;;
+@@ -11362,7 +11364,7 @@
+     if test "${enable_universalsdk}"; then
+ 	    :
+     else
+-	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
++	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only __BUILD_ARCH__"
+     fi
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+@@ -11374,7 +11376,7 @@
+         else
+             LIBTOOL_CRUFT=""
+     fi
+-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
++    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only __BUILD_ARCH__"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+ esac
+@@ -11524,7 +11526,9 @@
+ 		if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
+ 		then
+ 			if test "${enable_universalsdk}"; then
+-				LDFLAGS="-arch i386 -arch ppc -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++				LDFLAGS="__UNIVERSAL_LDFLAGS__ -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++			else
++				LDFLAGS="-arch __BUILD_ARCH__ ${LDFLAGS}"
+ 			fi
+ 			LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
+ 			BLDSHARED="$LDSHARED"

Added: trunk/dports/lang/python25/files/pyconfig.h-universal.ed
===================================================================
--- trunk/dports/lang/python25/files/pyconfig.h-universal.ed	                        (rev 0)
+++ trunk/dports/lang/python25/files/pyconfig.h-universal.ed	2011-05-10 07:19:08 UTC (rev 78502)
@@ -0,0 +1,50 @@
+/HAVE_LARGEFILE_SUPPORT/c
+#ifdef __LP64__
+/* #undef HAVE_LARGEFILE_SUPPORT */
+#else
+#define HAVE_LARGEFILE_SUPPORT 1
+#endif
+.
+/SIZEOF_LONG/c
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+/SIZEOF_PTHREAD_T/c
+#ifdef __LP64__
+#define SIZEOF_PTHREAD_T 8
+#else
+#define SIZEOF_PTHREAD_T 4
+#endif
+.
+/SIZEOF_SIZE_T/c
+#ifdef __LP64__
+#define SIZEOF_SIZE_T 8
+#else
+#define SIZEOF_SIZE_T 4
+#endif
+.
+/SIZEOF_TIME_T/c
+#ifdef __LP64__
+#define SIZEOF_TIME_T 8
+#else
+#define SIZEOF_TIME_T 4
+#endif
+.
+/SIZEOF_UINTPTR_T/c
+#ifdef __LP64__
+#define SIZEOF_UINTPTR_T 8
+#else
+#define SIZEOF_UINTPTR_T 4
+#endif
+.
+/SIZEOF_VOID_P/c
+#ifdef __LP64__
+#define SIZEOF_VOID_P 8
+#else
+#define SIZEOF_VOID_P 4
+#endif
+.
+w
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110510/721e4cea/attachment-0001.html>


More information about the macports-changes mailing list