[omniORB] OmniORB 3.0.4 on Mac OS X.1 (Darwin)
Asa MacWilliams
macwilli@informatik.tu-muenchen.de
Mon, 14 Jan 2002 16:40:01 +0100
--A5+fs1K7YxWXEtiz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi,
I've been working with OmniORB 3.0.4 on Mac OS X (Darwin), and it seems to
work out-of-the-box with Mac OS 10.0. In order to make it work on Mac OS
10.1, I had to make a few minor changes... so here is the patch. Note that
this also correctly handles the "broken pipe" signal when an IIOP connection
dies.
I have tested OmniNotify 1.1 on this platform as well, and it works fine,
as long as you set the environment variable DYLD_BIND_AT_LAUNCH=1 before
starting the notification service daemon.
Have fun,
Asa MacWilliams
--
|\ /\ /| Dipl.-Inf. Asa MacWilliams TU Muenchen, Institut fuer Informatik
| /--\ | asa.macwilliams@in.tum.de Orleansstr. 34, 81667 Muenchen, Germany
|/ \/ \| www.in.tum.de/~macwilli Zimmer O219 (ZI), 089-48095-155, Fax -160
--A5+fs1K7YxWXEtiz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="omni-3.0.4-macosx.1.patch"
diff -ur omni-orig/config/config.mk omni/config/config.mk
--- omni-orig/config/config.mk Mon Jun 18 19:43:01 2001
+++ omni/config/config.mk Wed Oct 17 11:34:01 2001
@@ -63,7 +63,7 @@
#platform = powerpc_aix_4.2_xlc5
#platform = powerpc_aix_4.3_xlc5
#platform = powerpc_linux_2.2_glibc
-#platform = powerpc_darwin_1.3
+platform = powerpc_darwin_1.3
#platform = hppa_hpux_10.20
#platform = hppa_hpux_11.00
#platform = m68k_nextstep_3.3
diff -ur omni-orig/include/omniORB3/CORBA_sysdep.h omni/include/omniORB3/CORBA_sysdep.h
--- omni-orig/include/omniORB3/CORBA_sysdep.h Fri Jun 1 15:56:57 2001
+++ omni/include/omniORB3/CORBA_sysdep.h Mon Jan 7 17:19:51 2002
@@ -513,6 +513,9 @@
# define _USE_GETHOSTNAME 1
#elif defined(__powerpc__)
# define _OMNIORB_HOST_BYTE_ORDER_ 0
+# if defined(__darwin__)
+# define _HAS_SIGNAL 1
+# endif
#else
# error "The byte order of this platform is unknown"
#endif
diff -ur omni-orig/mk/platforms/powerpc_darwin_1.3.mk omni/mk/platforms/powerpc_darwin_1.3.mk
--- omni-orig/mk/platforms/powerpc_darwin_1.3.mk Thu Jun 21 15:38:59 2001
+++ omni/mk/platforms/powerpc_darwin_1.3.mk Wed Oct 17 11:43:08 2001
@@ -10,7 +10,7 @@
#
# You must set a path to a Python 1.5.2 interpreter.
-#PYTHON = /usr/local/bin/python
+PYTHON = /usr/local/bin/python
#
@@ -83,7 +83,8 @@
SharedLibraryFullNameTemplate = lib$$1$$2.$$3.$$4.$(SHAREDLIB_SUFFIX)
SharedLibrarySoNameTemplate = lib$$1$$2.$$3.$(SHAREDLIB_SUFFIX)
SharedLibraryLibNameTemplate = lib$$1$$2.$(SHAREDLIB_SUFFIX)
-SharedLibraryPlatformLinkFlagsTemplate = -dynamiclib -undefined suppress
+#SharedLibraryPlatformLinkFlagsTemplate = -dynamiclib -undefined suppress
+SharedLibraryPlatformLinkFlagsTemplate = -dynamiclib -flat_namespace -undefined suppress
# Re-define 'ExportLibrary' to run 'ranlib' after the file is copied,
# for static libraries as otherwise the linker complains: "table of
diff -ur omni-orig/src/lib/omniORB2/dynamic/sharedlib/dir.mk omni/src/lib/omniORB2/dynamic/sharedlib/dir.mk
--- omni-orig/src/lib/omniORB2/dynamic/sharedlib/dir.mk Mon Jun 18 19:43:01 2001
+++ omni/src/lib/omniORB2/dynamic/sharedlib/dir.mk Wed Oct 17 11:53:04 2001
@@ -740,7 +740,7 @@
$(dynlib): $(DYN_OBJS)
(set -x; \
$(RM) $@; \
- $(CXX) -dynamiclib -undefined suppress -o $@ \
+ $(CXX) -dynamiclib -undefined suppress -flat_namespace -o $@ \
$(IMPORT_LIBRARY_FLAGS) \
$(filter-out $(LibSuffixPattern),$^) $(OMNITHREAD_LIB); \
)
diff -ur omni-orig/src/lib/omniORB2/orbcore/gatekeepers/tcpwrapper/sharedlib/dir.mk omni/src/lib/omniORB2/orbcore/gatekeepers/tcpwrapper/sharedlib/dir.mk
--- omni-orig/src/lib/omniORB2/orbcore/gatekeepers/tcpwrapper/sharedlib/dir.mk Mon Jun 18 19:43:00 2001
+++ omni/src/lib/omniORB2/orbcore/gatekeepers/tcpwrapper/sharedlib/dir.mk Wed Oct 17 11:52:54 2001
@@ -375,7 +375,7 @@
$(lib): $(OBJS) $(CXXOBJS)
(set -x; \
$(RM) $@; \
- $(CXX) -dynamiclib -undefined suppress -o $@ \
+ $(CXX) -dynamiclib -undefined suppress -flat_namespace -o $@ \
$(IMPORT_LIBRARY_FLAGS) \
$(filter-out $(LibSuffixPattern),$^); \
)
diff -ur omni-orig/src/lib/omniORB2/orbcore/sharedlib/dir.mk omni/src/lib/omniORB2/orbcore/sharedlib/dir.mk
--- omni-orig/src/lib/omniORB2/orbcore/sharedlib/dir.mk Mon Jun 18 19:43:00 2001
+++ omni/src/lib/omniORB2/orbcore/sharedlib/dir.mk Wed Oct 17 11:52:46 2001
@@ -744,7 +744,7 @@
$(lib): $(ORB_OBJS)
(set -x; \
$(RM) $@; \
- $(CXX) -dynamiclib -undefined suppress -o $@ \
+ $(CXX) -dynamiclib -undefined suppress -flat_namespace -o $@ \
$(IMPORT_LIBRARY_FLAGS) \
$(filter-out $(LibSuffixPattern),$^) $(OMNITHREAD_LIB); \
)
diff -ur omni-orig/src/lib/omnithread/sharedlib/dir.mk omni/src/lib/omnithread/sharedlib/dir.mk
--- omni-orig/src/lib/omnithread/sharedlib/dir.mk Mon Jun 18 19:43:00 2001
+++ omni/src/lib/omnithread/sharedlib/dir.mk Wed Oct 17 11:52:36 2001
@@ -581,7 +581,7 @@
$(lib): $(OBJS)
(set -x; \
$(RM) $@; \
- $(CXX) -dynamiclib -undefined suppress -o $@ \
+ $(CXX) -dynamiclib -undefined suppress -flat_namespace -o $@ \
$(IMPORT_LIBRARY_FLAGS) \
$(filter-out $(LibSuffixPattern),$^) $(OMNITHREAD_LIB); \
)
diff -ur omni-orig/src/tool/omniidl/cxx/dir.mk omni/src/tool/omniidl/cxx/dir.mk
--- omni-orig/src/tool/omniidl/cxx/dir.mk Mon Jun 18 19:43:00 2001
+++ omni/src/tool/omniidl/cxx/dir.mk Wed Oct 17 11:42:21 2001
@@ -523,10 +523,12 @@
soname = _omniidlmodule.$(IDLMODULE_MAJOR).so
lib = _omniidlmodule.$(IDLMODULE_MAJOR).$(IDLMODULE_MINOR).so
+# $(CXX) -bundle -undefined suppress -o $@ $(IMPORT_LIBRARY_FLAGS) \
+
$(lib): $(OBJS) $(PYOBJS)
(set -x; \
$(RM) $@; \
- $(CXX) -bundle -undefined suppress -o $@ $(IMPORT_LIBRARY_FLAGS) \
+ $(CXX) -bundle -undefined suppress -flat_namespace -o $@ $(IMPORT_LIBRARY_FLAGS) \
$(filter-out $(LibSuffixPattern),$^) $(LIBS) \
)
--A5+fs1K7YxWXEtiz--