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

[lblume at users.sourceforge.net]

Revision: 22149
          http://gar.svn.sourceforge.net/gar/?rev=22149&view=rev
Author:   lblume
Date:     2013-10-06 21:42:56 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
tcl85/trunk: Recipe fixes to build on Solaris 9 x86

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

Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile	2013-10-06 20:51:11 UTC (rev 22148)
+++ csw/mgar/pkg/tcl85/trunk/Makefile	2013-10-06 21:42:56 UTC (rev 22149)
@@ -32,29 +32,26 @@
 PACKAGES  = CSWtcl
 SPKG_DESC_CSWtcl = Tcl programming language 8.5
 RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-5
-RUNTIME_DEP_PKGS_CSWtcl-i386 = CSWsunmath
-RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH))
 
 # There are legacy packages depending on CSWtcl which require libtcl 8.4
 FOREIGN_PACKAGES += CSWlibtcl8-4
 RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-4
+#RUNTIME_DEP_PKGS_CSWtcl-i386-5.9 = CSWsunmath
+#RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH)-$(GAROSREL))
 CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWlibtcl8-4
 CHECKPKG_OVERRIDES_CSWtcl += unidentified-dependency|CSWlibtcl8-4
 
-# This is to find zoneinfo
-CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n
-CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n
-
 PACKAGES += CSWlibtcl8-5
 SPKG_DESC_CSWlibtcl8-5 = $(DESCRIPTION), libraries
 PKGFILES_CSWlibtcl8-5 += $(call pkgfiles_lib,libtcl8.5.so)
 PKGFILES_CSWlibtcl8-5 += $(libdir)/tcl8.5/.*
 # This dependency can not be tracked by checkpkg
 RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWtcl8-tclmodules
+#RUNTIME_DEP_PKGS_CSWlibtcl8-5-i386-5.9 += CSWsunmath
+#RUNTIME_DEP_PKGS_CSWlibtcl8-5 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-$(GARCH)-$(GAROSREL))
 CHECKPKG_OVERRIDES_CSWlibtcl8-5 += surplus-dependency|CSWtcl8-tclmodules
-RUNTIME_DEP_PKGS_CSWlibtcl8-5-i386 += CSWsunmath
-RUNTIME_DEP_PKGS_CSWlibtcl8-5 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-$(GARCH))
 
+
 # This is correct, the soname with *.so is really the one to use
 CHECKPKG_OVERRIDES_CSWlibtcl8-5 += soname-equals-filename
 
@@ -74,7 +71,12 @@
 PKGFILES_CSWtcl-dev += $(call baseisadirs,$(libdir),tclConfig.sh)
 RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5
 
-BUILD64 = 1
+# Enable 64 bits, but not for Solaris 9 x86
+BUILD64_5.9_sparc = 1
+BUILD64_5.10_sparc = 1
+BUILD64_5.9_i386 =
+BUILD64_5.10_i386 = 1
+BUILD64 = $(BUILD64_$(GAROSREL)_$(GARCH))
 ISAEXEC = 1
 
 INCLUDE_FLAGS =

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