[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openais
Subject:    [Openais] Fix compilation of openais on darwin
From:       Alex Bligh <alex () alex ! org ! uk>
Date:       2008-11-26 12:53:25
Message-ID: 9B600676E1D4DBA1A4B0C25F () Ximines ! local
[Download RAW message or body]

Please accept the following patch which fixes compilation of openais 0.91
on darwin. This allows openais to compile on OS-X. I have not tested
whether it works. It probably needs applying to trunk too, but I have other
compilation problems compiling trunk right now.

The three things it fixes are restricted to the situation of OS-X
compilation (i.e. where OPENAIS_COMPAT is set to DARWIN), and hence
should not affect anything else.

1. COROSYNC_BIN is undefined when building openais. This breaks the
   bundle loader stuff for the darwin linker. Arguably this should
   be $(DESTDIR)$(PREFIX)/sbin/corosync. Not sure really.

2. libSaAmf.so build line was missing for Darwin builds, but not for
   non-Darwin builds.

3. Darwin build line for libSaEvt was truncated, meaning a.out was built
   instead.

I think these probably fall into the "obviously correct" category.

Alex
["openais-darwin-amb-1.patch" (application/octet-stream)]

Index: services/Makefile
===================================================================
--- services/Makefile	(revision 1663)
+++ services/Makefile	(working copy)
@@ -63,6 +63,8 @@
 
 ifeq (${OPENAIS_COMPAT}, DARWIN)
 
+COROSYNC_BIN=$(PREFIX)/sbin/corosync
+
 service_evs.lcrso: evs.o
 	$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader $(COROSYNC_BIN) -bind_at_load evs.o -o $@
 
Index: lib/Makefile
===================================================================
--- lib/Makefile	(revision 1663)
+++ lib/Makefile	(working copy)
@@ -52,6 +52,9 @@
 
 DARWIN_OPTS=-dynamiclib -bind_at_load -current_version 2.0.0 -compatibility_version 2.0.0
 
+libSaAmf.so.2.0.0: util.o amf.o
+	$(CC) $(DARWIN_OPTS) util.o amf.o -o $@
+
 libSaClm.so.2.0.0: util.o clm.o
 	$(CC) $(DARWIN_OPTS) util.o clm.o -o $@
 
@@ -59,7 +62,7 @@
 	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o ckpt.o -o $@
 
 libSaEvt.so.2.0.0: util.o evt.o 
-	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o evt.o
+	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o evt.o -o $@
 
 libSaMsg.so.2.0.0: util.o msg.o
 	$(CC) $(DARWIN_OPTS) util.o msg.o -o $@


_______________________________________________
Openais mailing list
Openais@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/openais

[prev in list] [next in list] [prev in thread] [next in thread]