[22988] trunk/dports/gnustep/gnustep-base

[source_changes at macosforge.org]

Revision: 22988
          http://trac.macosforge.org/projects/macports/changeset/22988
Author:   yves at macports.org
Date:     2007-03-20 21:38:47 -0700 (Tue, 20 Mar 2007)

Log Message:
-----------
GNustep base now uses ffcall on ppc as suggested by W. Lux.

Modified Paths:
--------------
    trunk/dports/gnustep/gnustep-base/Portfile

Added Paths:
-----------
    trunk/dports/gnustep/gnustep-base/files/
    trunk/dports/gnustep/gnustep-base/files/base.patch
    trunk/dports/gnustep/gnustep-base/files/base.svn.patch

Modified: trunk/dports/gnustep/gnustep-base/Portfile
===================================================================
--- trunk/dports/gnustep/gnustep-base/Portfile	2007-03-21 03:22:07 UTC (rev 22987)
+++ trunk/dports/gnustep/gnustep-base/Portfile	2007-03-21 04:38:47 UTC (rev 22988)
@@ -5,6 +5,7 @@
 
 name        gnustep-base
 version     1.13.1
+revision	1
 platforms   darwin
 maintainers yves at macports.org
 
@@ -20,7 +21,7 @@
     portion of the OpenStep standard (the Foundation library).
 
 checksums     md5 bdc92ab7048cd1ee8c18957b750686b5
-depends_lib   port:gnustep-make port:libxslt port:openssl
+depends_lib   port:ffcall port:gnustep-make port:libxslt port:openssl
 
 pre-extract {
     if { 
@@ -35,25 +36,41 @@
     }
 }
 
-patch {
+patchfiles	base.patch
+post-patch {
     reinplace "s|CODING-STANDARDS|GS-CODING-STANDARDS|g" \
         ${worksrcpath}/Documentation/GNUmakefile
 }
 
 use_configure   yes
+configure.args-append	LDFLAGS=-L${prefix}/lib
 
+destroot.keepdirs    ${destroot}${prefix}/var/run
+
+startupitem.create  yes
+startupitem.name	gdomap
+set my_pid          ${prefix}/var/run/gdomap.pid
+startupitem.start   \
+    "GNUSTEP_SYSTEM_ROOT=${prefix}/GNUstep/System" \
+    "\[ -f \$GNUSTEP_SYSTEM_ROOT/Tools/gdomap \] && \\" \
+    "rm -f ${my_pid} && \\" \
+    "\$GNUSTEP_SYSTEM_ROOT/Tools/gdomap -p -I ${my_pid}"
+startupitem.stop    \
+    "\[ -r ${prefix}/var/run/gdomap.pid \] && \\" \
+    "kill -9 `cat ${my_pid}` && \\" \
+    "rm -f ${my_pid}"
+
 platform powerpc {
-    configure.args-append --with-ffi-include=${prefix}/include/gcc41 \
-                          --with-ffi-library=${prefix}/lib/gcc41
+	variant with_ffi {
+    	configure.args-append \
+    		--enable-libffi \
+    		--with-ffi-include=${prefix}/include/gcc41 \
+            --with-ffi-library=${prefix}/lib/gcc41
+    }
 }
 
-platform x86 {
-    depends_lib-append port:ffcall
-}
-
 platform darwin {
     build.args-append    GUI_LIBS=""
-    destroot.keepdirs    ${destroot}${prefix}/var/run
     
     post-destroot {
         cd ${destroot}${prefix}/GNUstep/System
@@ -66,18 +83,4 @@
             **** GNUstep 'defaults' tool is renamed 'gdefaults' to avoid\
             overriding Apple's defaults tool. *****\n\n"
     }
-
-    startupitem.create  yes
-    startupitem.name	gdomap
-    set my_pid          ${prefix}/var/run/gdomap.pid
-    startupitem.start   \
-        "GNUSTEP_SYSTEM_ROOT=${prefix}/GNUstep/System" \
-        "\[ -f \$GNUSTEP_SYSTEM_ROOT/Tools/gdomap \] && \\" \
-        "rm -f ${my_pid} && \\" \
-        "\$GNUSTEP_SYSTEM_ROOT/Tools/gdomap -p -I ${my_pid}"
-    startupitem.stop    \
-        "\[ -r ${prefix}/var/run/gdomap.pid \] && \\" \
-        "kill -9 `cat ${my_pid}` && \\" \
-        "rm -f ${my_pid}"
 }
-

Added: trunk/dports/gnustep/gnustep-base/files/base.patch
===================================================================
--- trunk/dports/gnustep/gnustep-base/files/base.patch	                        (rev 0)
+++ trunk/dports/gnustep/gnustep-base/files/base.patch	2007-03-21 04:38:47 UTC (rev 22988)
@@ -0,0 +1,30 @@
+Index: configure
+===================================================================
+--- configure	(Revision 24883)
++++ configure	(Arbeitskopie)
+@@ -15578,10 +15578,6 @@
+ # We enable ffcall by default now.
+ #--------------------------------------------------------------------
+ do_enable_libffi=no
+-# Enable libffi by default on the following machines
+-case "$target_os" in
+-    darwin*)	do_enable_libffi=yes;;
+-esac
+ 
+ # Check whether --enable-libffi was given.
+ if test "${enable_libffi+set}" = set; then
+Index: configure.ac
+===================================================================
+--- configure.ac	(Revision 24883)
++++ configure.ac	(Arbeitskopie)
+@@ -1804,10 +1804,6 @@
+ # We enable ffcall by default now.
+ #--------------------------------------------------------------------
+ do_enable_libffi=no
+-# Enable libffi by default on the following machines
+-case "$target_os" in
+-    darwin*)	do_enable_libffi=yes;;
+-esac
+ 
+ AC_ARG_ENABLE(libffi,
+   [  --enable-libffi  		Enable use of libffi library],,

Added: trunk/dports/gnustep/gnustep-base/files/base.svn.patch
===================================================================
--- trunk/dports/gnustep/gnustep-base/files/base.svn.patch	                        (rev 0)
+++ trunk/dports/gnustep/gnustep-base/files/base.svn.patch	2007-03-21 04:38:47 UTC (rev 22988)
@@ -0,0 +1,43 @@
+Index: configure
+===================================================================
+--- configure	(Revision 24883)
++++ configure	(Arbeitskopie)
+@@ -15578,10 +15578,6 @@
+ # We enable ffcall by default now.
+ #--------------------------------------------------------------------
+ do_enable_libffi=no
+-# Enable libffi by default on the following machines
+-case "$target_os" in
+-    darwin*)	do_enable_libffi=yes;;
+-esac
+ 
+ # Check whether --enable-libffi was given.
+ if test "${enable_libffi+set}" = set; then
+Index: configure.ac
+===================================================================
+--- configure.ac	(Revision 24883)
++++ configure.ac	(Arbeitskopie)
+@@ -1804,10 +1804,6 @@
+ # We enable ffcall by default now.
+ #--------------------------------------------------------------------
+ do_enable_libffi=no
+-# Enable libffi by default on the following machines
+-case "$target_os" in
+-    darwin*)	do_enable_libffi=yes;;
+-esac
+ 
+ AC_ARG_ENABLE(libffi,
+   [  --enable-libffi  		Enable use of libffi library],,
+Index: config/config.trampoline.c
+===================================================================
+--- config/config.trampoline.c	(Revision 24883)
++++ config/config.trampoline.c	(Arbeitskopie)
+@@ -60,7 +60,7 @@
+ #ifdef __arm__
+ register void* env __asm__("r12");
+ #endif
+-#ifdef __powerpc__
++#if defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__)
+ #ifdef __NetBSD__
+ register void* env __asm__("r13");
+ #else

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070320/6dfe666f/attachment.html