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

[wahwah at users.sourceforge.net]

Revision: 15729
          http://gar.svn.sourceforge.net/gar/?rev=15729&view=rev
Author:   wahwah
Date:     2011-09-24 14:32:46 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
pkg/libgmp/trunk: build for pentium_pro by default on Intel

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

Modified: csw/mgar/pkg/libgmp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgmp/trunk/Makefile	2011-09-24 08:01:34 UTC (rev 15728)
+++ csw/mgar/pkg/libgmp/trunk/Makefile	2011-09-24 14:32:46 UTC (rev 15729)
@@ -73,16 +73,16 @@
 CATALOGNAME_CSWlibgmp10 = libgmp10
 SPKG_DESC_CSWlibgmp10 = GNU Multiple Precision Arithmetic Library, libgmp.so.10
 PKGFILES_CSWlibgmp10 = $(call baseisadirs,$(libdir),libgmp\.so\.10(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibgmp10 += CSWgcc4corert
+RUNTIME_DEP_PKGS_CSWlibgmp10 += CSWlibgcc-s1
 
 PACKAGES += CSWlibgmpxx4
 CATALOGNAME_CSWlibgmpxx4 = libgmpxx4
 PKGFILES_CSWlibgmpxx4 += $(call baseisadirs,$(libdir),libgmpxx\.so\.4\.2\.2)
 PKGFILES_CSWlibgmpxx4 += $(call baseisadirs,$(libdir),libgmpxx\.so\.4(\.\d+)*)
 SPKG_DESC_CSWlibgmpxx4 += Development Files for libgmp, libgmpxx.so.4
+RUNTIME_DEP_PKGS_CSWlibgmpxx4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibgmpxx4 += CSWlibgmp10
-RUNTIME_DEP_PKGS_CSWlibgmpxx4 += CSWgcc4g++rt
-RUNTIME_DEP_PKGS_CSWlibgmpxx4 += CSWgcc4corert
+RUNTIME_DEP_PKGS_CSWlibgmpxx4 += CSWlibstdc++6
 
 PACKAGES += CSWlibgmp-dev
 CATALOGNAME_CSWlibgmp-dev = libgmp_dev
@@ -114,7 +114,7 @@
 # See also below.
 # Here's an idea how to build it, but unfortunately, building for sparcv8plus
 # fails too.
-# ISA_DEFAULT_i386 = pentium_pro
+ISA_DEFAULT_i386 = pentium_pro
 # ISA_DEFAULT_sparc = sparcv8plus
 
 include gar/category.mk
@@ -122,12 +122,12 @@
 ## Undefined symbol __sync_fetch_and_add_4
 ## http://www.mail-archive.com/maintainers@lists.opencsw.org/msg06095.html
 ## http://opencsw.wikidot.com/porting-faq#toc6
-ifeq ($(ISA),sparcv8)
-OPT_FLAGS_GCC = -O0
-endif
-ifeq ($(ISA),i386)
-OPT_FLAGS_GCC = -O0
-endif
+# ifeq ($(ISA),sparcv8)
+# OPT_FLAGS_GCC =
+# endif
+# ifeq ($(ISA),i386)
+# OPT_FLAGS_GCC =
+# endif
 
 post-merge:
 	ginstall $(FILEDIR)/gmp.h $(PKGROOT)$(includedir)/gmp.h

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