[csw-devel] SF.net SVN: gar:[18422] csw/mgar/pkg/libneon27/branches/libneon27-openssl-0 .9.8-solaris-9/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 18422
          http://gar.svn.sourceforge.net/gar/?rev=18422&view=rev
Author:   dmichelsen
Date:     2012-06-15 09:06:31 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
libneon27/branches/libneon27-openssl-0.9.8-solaris-9: Disable 64 bit for Solaris 9 on i386

Modified Paths:
--------------
    csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile

Modified: csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile
===================================================================
--- csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile	2012-06-15 08:21:26 UTC (rev 18421)
+++ csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile	2012-06-15 09:06:31 UTC (rev 18422)
@@ -83,8 +83,15 @@
 CONFIGURE_ARGS += --with-expat
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES))
 
-BUILD64 = 1
+# Enabling 64 bit for i386 means amd64 which means building on Solaris 10 and
+# merging on Solaris 9. As Solaris 10 has openssl 1.0.0 this results in mixed
+# bindings and as there is a different libneon27 for Solaris 10 anyway we disable
+# the unused 64 bit for i368 here.
+BUILD64-i386 =
+BUILD64-sparc = 1
 
+BUILD64 = $(BUILD64-$(GARCH))
+
 # Tests fail, investigate later
 SKIPTEST ?= 1
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.