[csw-devel] SF.net SVN: gar:[4318] csw/mgar/pkg/curl/trunk

[harpchad at users.sourceforge.net]

Revision: 4318
          http://gar.svn.sourceforge.net/gar/?rev=4318&view=rev
Author:   harpchad
Date:     2009-04-15 14:13:48 +0000 (Wed, 15 Apr 2009)

Log Message:
-----------
Fix header files to support both 32 and 64bit (sparc)

Modified Paths:
--------------
    csw/mgar/pkg/curl/trunk/Makefile
    csw/mgar/pkg/curl/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/curl/trunk/files/curlbuild.h

Modified: csw/mgar/pkg/curl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/curl/trunk/Makefile	2009-04-15 13:53:17 UTC (rev 4317)
+++ csw/mgar/pkg/curl/trunk/Makefile	2009-04-15 14:13:48 UTC (rev 4318)
@@ -19,6 +19,7 @@
 DISTFILES += libcurl.so.2.0.2.s
 DISTFILES += libcurl.so.3.0.0.i
 DISTFILES += libcurl.so.2.0.2.i
+DISTFILES += curlbuild.h
 
 PACKAGES = CSWcurl CSWcurlrt CSWcurldevel
 CATALOGNAME_CSWcurl = curl
@@ -52,8 +53,18 @@
 	@cp $(FILEDIR)/libcurl.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libcurl.so.2.0.2
 	@( cd $(INSTALLISADIR)/opt/csw/lib; ln -s libcurl.so.3.0.0 libcurl.so.3 )
 	@( cd $(INSTALLISADIR)/opt/csw/lib; ln -s libcurl.so.2.0.2 libcurl.so.2 )
+	@mv $(INSTALLISADIR)/opt/csw/include/curl/curlbuild.h $(INSTALLISADIR)/opt/csw/include/curl/curlbuild-32.h
+	@cp $(FILEDIR)/curlbuild.h $(INSTALLISADIR)/opt/csw/include/curl/curlbuild.h
 	$(DONADA)
 
+post-install-isa-sparcv9:
+	@mv $(INSTALLISADIR)/opt/csw/include/curl/curlbuild.h $(INSTALLISADIR)/opt/csw/include/curl/curlbuild-64.h
+	$(DONADA)
+
+post-merge-isa-sparcv9:
+	@cp $(INSTALLISADIR)/opt/csw/include/curl/curlbuild-64.h $(PKGROOT)/opt/csw/include/curl/curlbuild-64.h
+	$(DONADA)
+
 post-install-isa-i386:
 	@cp $(FILEDIR)/libcurl.so.3.0.0.i $(INSTALLISADIR)/opt/csw/lib/libcurl.so.3.0.0
 	@cp $(FILEDIR)/libcurl.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libcurl.so.2.0.2

Modified: csw/mgar/pkg/curl/trunk/checksums
===================================================================
--- csw/mgar/pkg/curl/trunk/checksums	2009-04-15 13:53:17 UTC (rev 4317)
+++ csw/mgar/pkg/curl/trunk/checksums	2009-04-15 14:13:48 UTC (rev 4318)
@@ -3,3 +3,4 @@
 b46b41659b805013740eeb76e759af4b  download/libcurl.so.2.0.2.s
 30e826ef67b6ce799b32154250014dd9  download/libcurl.so.3.0.0.i
 a09fcad6dfcd9636061dfab7598357be  download/libcurl.so.2.0.2.i
+e4d1b44b1176769755e51ba43408b0b3  download/curlbuild.h

Added: csw/mgar/pkg/curl/trunk/files/curlbuild.h
===================================================================
--- csw/mgar/pkg/curl/trunk/files/curlbuild.h	                        (rev 0)
+++ csw/mgar/pkg/curl/trunk/files/curlbuild.h	2009-04-15 14:13:48 UTC (rev 4318)
@@ -0,0 +1,6 @@
+#Allow 32 and 64 bit headers to coexist
+#if defined __arch64__ || defined __sparcv9
+#include "curlbuild-64.h"
+#else
+#include "curlbuild-32.h"
+#endif


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