[csw-devel] SF.net SVN: gar:[15279] csw/mgar/pkg/libgmp/trunk

[wahwah at users.sourceforge.net]

Revision: 15279
          http://gar.svn.sourceforge.net/gar/?rev=15279&view=rev
Author:   wahwah
Date:     2011-08-06 09:36:08 +0000 (Sat, 06 Aug 2011)

Log Message:
-----------
pkg/libgmp/trunk: a better way to handle 32-bit vs 64-bit

Modified Paths:
--------------
    csw/mgar/pkg/libgmp/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libgmp/trunk/files/gmp.h

Modified: csw/mgar/pkg/libgmp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgmp/trunk/Makefile	2011-08-06 07:35:40 UTC (rev 15278)
+++ csw/mgar/pkg/libgmp/trunk/Makefile	2011-08-06 09:36:08 UTC (rev 15279)
@@ -24,7 +24,6 @@
 
 SPKG_SOURCEURL = http://gmplib.org/
 
-#GARCOMPILER = GCC4
 BUILD64 = 1
 
 EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis 
@@ -52,8 +51,9 @@
 
 CONFIGURE_ARGS = ABI=$(ABI_$(ISA)) MPN_PATH=$(MPN_$(ISA)) $(DIRPATHS)
 
-# For 64-bit compilation, we need /opt/csw/include/sparcv9/gmp.h
-EXTRA_MERGE_DIRS_isa-extra = $(includedir)
+EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/gmp.h$$,.$(includedir)/gmp-32.h,p"
+EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/gmp.h$$,.$(includedir)/gmp-64.h,p"
+EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL))
 
 PACKAGES += CSWlibgmp10
 CATALOGNAME_CSWlibgmp10 = libgmp10
@@ -66,17 +66,11 @@
 # Catchall PKGFILES
 RUNTIME_DEP_PKGS_CSWlibgmp-dev = CSWlibgmp10
 
-#RUNTIME_DEP_PKGS = CSWgcc4corert
-
 # It's only an .info file.
 CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/gmp.info-1
 
 include gar/category.mk
 
-#ifeq ($(ISA), sparcv8plus)
-#	ARCHFLAGS_$(GARCOMPILER)_$(ISA) = -mcpu=v9 -mv8plus
-#endif
-#ifeq ($(ISA), sparcv8plus+vis)
-#	ARCHFLAGS_$(GARCOMPILER)_$(ISA) = -mcpu=ultrasparc -mvis
-#endif
-
+post-merge:
+	ginstall $(FILEDIR)/gmp.h $(PKGROOT)$(includedir)/gmp.h
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/libgmp/trunk/files/gmp.h
===================================================================
--- csw/mgar/pkg/libgmp/trunk/files/gmp.h	                        (rev 0)
+++ csw/mgar/pkg/libgmp/trunk/files/gmp.h	2011-08-06 09:36:08 UTC (rev 15279)
@@ -0,0 +1,6 @@
+/* Allow 32 and 64 bit headers to coexist */
+#if defined __amd64 || defined __x86_64 || defined __sparcv9
+#include "gmp-64.h"
+#else
+#include "gmp-32.h"
+#endif


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