SF.net SVN: gar:[25455] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

lblume at users.sourceforge.net lblume at users.sourceforge.net
Mon Dec 14 09:37:29 CET 2015


Revision: 25455
          http://sourceforge.net/p/gar/code/25455
Author:   lblume
Date:     2015-12-14 08:37:29 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Update deps

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2015-12-13 04:02:38 UTC (rev 25454)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2015-12-14 08:37:29 UTC (rev 25455)
@@ -26,7 +26,7 @@
 
 # Keep default old Studio 12.0 for old S9 only
 ifneq ($(shell /usr/bin/uname -r),5.9)
-       GARCOMPILER = GCC4
+       GARCOMPILER = GCC5
        # Try to get some more oomph out of a sparc
        # Benchmarks w/ 5.5.34 show no obvious benefit, so disabled for now
        #EXTRA_BUILD_ISAS_sparc = sparcv9+vis2
@@ -167,11 +167,10 @@
 PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(bindir)/$(bin_name))
 PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(sbindir)/$(bin_name))
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1
-RUNTIME_DEP_PKGS_CSW$(NAME)client_5.9 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSW$(NAME)client_5.10 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSW$(NAME)client += $(RUNTIME_DEP_PKGS_CSW$(NAME)client_$(GAROSREL))
-### For GCC4
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0
+### For GCC
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6
 CHECKPKG_OVERRIDES_CSW$(NAME)client += file-collision
 #CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry
 
@@ -189,11 +188,10 @@
 SPKG_DESC_CSW$(NAME) = Multithreaded SQL database
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1
-RUNTIME_DEP_PKGS_CSW$(NAME)_5.9 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSW$(NAME)_5.10 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSW$(NAME) += $(RUNTIME_DEP_PKGS_CSW$(NAME)_$(GAROSREL))
-### For GCC4
+RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibssl1-0-0
+### For GCC
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSW$(NAME)+= CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1
 
 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry

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



More information about the devel mailing list