[77464] trunk/dports/devel/omniORB

31 Mar 2011

Revision: 77464
          http://trac.macports.org/changeset/77464
Author:   jmr@macports.org
Date:     2011-03-31 10:38:18 -0700 (Thu, 31 Mar 2011)
Log Message:
-----------
omniORB: mostly fix universal build (#23558)

Modified Paths:
--------------
    trunk/dports/devel/omniORB/Portfile

Added Paths:
-----------
    trunk/dports/devel/omniORB/files/
    trunk/dports/devel/omniORB/files/include_omniORB4_acconfig.h.ed
    trunk/dports/devel/omniORB/files/include_omniconfig.h.in.ed
    trunk/dports/devel/omniORB/files/mk_beforeauto.mk.in.diff
    trunk/dports/devel/omniORB/files/src_tool_omniidl_cxx_cccp_config-darwin.h.diff

Modified: trunk/dports/devel/omniORB/Portfile
===================================================================

--- trunk/dports/devel/omniORB/Portfile	2011-03-31 15:28:55 UTC (rev 77463)
+++ trunk/dports/devel/omniORB/Portfile	2011-03-31 17:38:18 UTC (rev 77464)
@@ -18,14 +18,26 @@
                     sha1    7150d999bcef10c6c3cb24725386497c3f338aa1 \
                     rmd160  b84131230c59b1cef8f714ff1545e44f6779ade1
 
+patchfiles          src_tool_omniidl_cxx_cccp_config-darwin.h.diff
+
 configure.args      --with-omniORB-config="${prefix}/etc/omniORB.cfg" \
                     --with-omniNames-logdir="${prefix}/var"
 
 post-patch {
     reinplace "s|,prefix=\'\$PYTHON_PREFIX\'||g" ${worksrcpath}/configure
     reinplace "s|,prefix=\'\$PYTHON_EXEC_PREFIX\'||g" ${worksrcpath}/configure
+    if {[variant_isset universal]} {
+        system "cd ${worksrcpath} && ed - ./include/omniconfig.h.in < ${filespath}/include_omniconfig.h.in.ed"
+    }
 }
 
+if {[variant_isset universal]} {
+    patchfiles-append mk_beforeauto.mk.in.diff
+    post-configure {
+        system "cd ${worksrcpath} && ed - ./include/omniORB4/acconfig.h < ${filespath}/include_omniORB4_acconfig.h.ed"
+    }
+}
+
 variant ssl description {Enable SSL support} {
     configure.args-append   --with-openssl
     depends_lib-append      port:openssl
@@ -50,6 +62,11 @@
     configure.python        ${prefix}/bin/python2.6
 }
 
+platform darwin 8 {
+    # needs -Xarch
+    universal_variant no
+}
+
 livecheck.type      regex
 livecheck.url       http://omniorb.sourceforge.net/releases/
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/devel/omniORB/files/include_omniORB4_acconfig.h.ed
===================================================================
--- trunk/dports/devel/omniORB/files/include_omniORB4_acconfig.h.ed	                        (rev 0)
+++ trunk/dports/devel/omniORB/files/include_omniORB4_acconfig.h.ed	2011-03-31 17:38:18 UTC (rev 77464)
@@ -0,0 +1,22 @@
+/#define SIZEOF_BOOL/c
+#if defined(__LP64__) || !defined(__POWERPC__)
+#define SIZEOF_BOOL 1
+#else
+#define SIZEOF_BOOL 4
+#endif
+.
+/#define SIZEOF_LONG/c
+#if defined(__LP64__)
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+/#define SIZEOF_VOIDP/c
+#if defined(__LP64__)
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+.
+w

Added: trunk/dports/devel/omniORB/files/include_omniconfig.h.in.ed
===================================================================
--- trunk/dports/devel/omniORB/files/include_omniconfig.h.in.ed	                        (rev 0)
+++ trunk/dports/devel/omniORB/files/include_omniconfig.h.in.ed	2011-03-31 17:38:18 UTC (rev 77464)
@@ -0,0 +1,8 @@
+/#define @PROCESSOR_DEFINE@ 1/c
+#if defined(__i386__)
+#define __x86__ 1
+#elif defined(__POWERPC__)
+#define __powerpc__ 1
+#endif
+.
+w

Added: trunk/dports/devel/omniORB/files/mk_beforeauto.mk.in.diff
===================================================================
--- trunk/dports/devel/omniORB/files/mk_beforeauto.mk.in.diff	                        (rev 0)
+++ trunk/dports/devel/omniORB/files/mk_beforeauto.mk.in.diff	2011-03-31 17:38:18 UTC (rev 77464)
@@ -0,0 +1,53 @@
+--- mk/beforeauto.mk.in.orig	2009-06-18 18:45:32.000000000 +1000
++++ mk/beforeauto.mk.in	2011-04-01 03:47:51.000000000 +1100
+@@ -1155,49 +1155,7 @@
+ # Processor
+ #
+ 
+-ifdef x86Processor
+-IMPORT_CPPFLAGS += -D__x86__
+-endif
+-
+-ifdef x8664Processor
+-IMPORT_CPPFLAGS += -D__x86_64__
+-endif
+-
+-ifdef SparcProcessor
+-IMPORT_CPPFLAGS += -D__sparc__
+-endif
+-
+-ifdef AlphaProcessor
+-IMPORT_CPPFLAGS += -D__alpha__
+-endif
+-
+-ifdef m68kProcessor
+-IMPORT_CPPFLAGS += -D__m68k__
+-endif
+-
+-ifdef IndigoProcessor
+-IMPORT_CPPFLAGS += -D__mips__
+-endif
+-
+-ifdef ArmProcessor
+-IMPORT_CPPFLAGS += -D__arm__
+-endif
+-
+-ifdef s390Processor
+-IMPORT_CPPFLAGS += -D__s390__
+-endif
+-
+-ifdef ia64Processor
+-IMPORT_CPPFLAGS += -D__ia64__
+-endif
+-
+-ifdef HppaProcessor
+-IMPORT_CPPFLAGS += -D__hppa__
+-endif
+-
+-ifdef PowerPCProcessor
+-IMPORT_CPPFLAGS += -D__powerpc__
+-endif
++IMPORT_CPPFLAGS += -Xarch_i386 -D__x86__ -Xarch_ppc64 -D__powerpc__ -Xarch_ppc -D__powerpc__
+ 
+ 
+ ###########################################################################

Added: trunk/dports/devel/omniORB/files/src_tool_omniidl_cxx_cccp_config-darwin.h.diff
===================================================================
--- trunk/dports/devel/omniORB/files/src_tool_omniidl_cxx_cccp_config-darwin.h.diff	                        (rev 0)
+++ trunk/dports/devel/omniORB/files/src_tool_omniidl_cxx_cccp_config-darwin.h.diff	2011-03-31 17:38:18 UTC (rev 77464)
@@ -0,0 +1,12 @@
+--- src/tool/omniidl/cxx/cccp/config-darwin.h.orig	2003-03-24 08:01:40.000000000 +1100
++++ src/tool/omniidl/cxx/cccp/config-darwin.h	2011-04-01 03:56:47.000000000 +1100
+@@ -1,9 +1,4 @@
+-#if defined(__powerpc__) || defined(__x86__)
+-
+ #define SIZEOF_UNSIGNED_CHAR 1
+ #define SIZEOF_INT 4
+ #define HAVE_STDLIB_H 1
+ #define HAVE_STRERROR 1
+-
+-#endif
+-

    

jmr＠macports.org

tags

participants (1)