[csw-devel] SF.net SVN: gar:[8512] csw/mgar/pkg/c-ares/trunk

[dmichelsen at users.sourceforge.net]

Revision: 8512
          http://gar.svn.sourceforge.net/gar/?rev=8512&view=rev
Author:   dmichelsen
Date:     2010-02-12 09:17:31 +0000 (Fri, 12 Feb 2010)

Log Message:
-----------
c-ares: Seperate includes for 32/64 bit

Modified Paths:
--------------
    csw/mgar/pkg/c-ares/trunk/Makefile
    csw/mgar/pkg/c-ares/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/c-ares/trunk/files/ares_build.h

Modified: csw/mgar/pkg/c-ares/trunk/Makefile
===================================================================
--- csw/mgar/pkg/c-ares/trunk/Makefile	2010-02-12 04:12:56 UTC (rev 8511)
+++ csw/mgar/pkg/c-ares/trunk/Makefile	2010-02-12 09:17:31 UTC (rev 8512)
@@ -8,6 +8,7 @@
 
 MASTER_SITES = http://c-ares.haxx.se/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += ares_build.h
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -29,6 +30,17 @@
 
 TEST_TARGET = check
 
+EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/ares_build.h$$,.$(includedir)/ares_build-32.h,p"
+EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/ares_build.h$$,.$(includedir)/ares_build-64.h,p"
+EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL))
+
 PKGFILES_CSWlibcaresdevel = $(PKGFILES_DEVEL)
 
+POSTMSG = /opt/csw/share/doc/libcares/license
+POSTMSG += /opt/csw/lib/pkgconfig/libcares.pc
+
 include gar/category.mk
+
+post-merge:
+	ginstall $(FILEDIR)/ares_build.h $(PKGROOT)$(includedir)/ares_build.h
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/c-ares/trunk/checksums
===================================================================
--- csw/mgar/pkg/c-ares/trunk/checksums	2010-02-12 04:12:56 UTC (rev 8511)
+++ csw/mgar/pkg/c-ares/trunk/checksums	2010-02-12 09:17:31 UTC (rev 8512)
@@ -1 +1,2 @@
+86e9bb345124ecaa520a68c4c482a122  ares_build.h
 15ab7852306b554b0b1145f41005a3bb  c-ares-1.7.0.tar.gz

Copied: csw/mgar/pkg/c-ares/trunk/files/ares_build.h (from rev 8478, csw/mgar/pkg/curl/trunk/files/curlbuild.h)
===================================================================
--- csw/mgar/pkg/c-ares/trunk/files/ares_build.h	                        (rev 0)
+++ csw/mgar/pkg/c-ares/trunk/files/ares_build.h	2010-02-12 09:17:31 UTC (rev 8512)
@@ -0,0 +1,6 @@
+/* Allow 32 and 64 bit headers to coexist */
+#if defined __amd64 || defined __x86_64 || defined __sparcv9
+#include "ares_build-64.h"
+#else
+#include "ares_build-32.h"
+#endif


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