SF.net SVN: gar:[25836] csw/mgar/pkg/subversion/trunk/Makefile
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Jul 13 19:29:50 CEST 2016
Revision: 25836
http://sourceforge.net/p/gar/code/25836
Author: dmichelsen
Date: 2016-07-13 17:29:49 +0000 (Wed, 13 Jul 2016)
Log Message:
-----------
subversion/trunk: Update dependencies
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2016-07-12 18:26:02 UTC (rev 25835)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2016-07-13 17:29:49 UTC (rev 25836)
@@ -79,6 +79,8 @@
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-diff1-0
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-delta1-0
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-fs1-0
+RUNTIME_DEP_PKGS_CSWsubversion-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWsubversion += $(RUNTIME_DEP_PKGS_CSWsubversion-$(GAROSREL)-$(GARCH))
OBSOLETED_BY_CSWsubversion += CSWsvn
CATALOGNAME_CSWsvn = subversion_stub
@@ -97,7 +99,6 @@
RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-ra-svn1-0
RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWrb-subversion
RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-fs-x1-0
-RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWjavasvn
RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWpy-subversion
RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-ra-local1-0
RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-wc1-0
@@ -107,6 +108,8 @@
RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-fs-util1-0
RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWpm-subversion
RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-ra-serf1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev-5.10 += CSWjavasvn
+RUNTIME_DEP_PKGS_CSWsubversion-dev += $(RUNTIME_DEP_PKGS_CSWsubversion-dev-$(GAROSREL))
OBSOLETED_BY_CSWsubversion-dev += CSWsvn-dev
PACKAGES += CSWlibsvn-auth-gnome-keyring1-0
@@ -118,7 +121,9 @@
RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibsvn-subr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.9 += CSWglib2
RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10-sparc += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-client1-0
SPKG_DESC_CSWlibsvn-client1-0 = Subversion library libsvn_client-1.so.0
@@ -130,6 +135,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-wc1-0
RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-diff1-0
RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-client1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-delta1-0
SPKG_DESC_CSWlibsvn-delta1-0 = Subversion library libsvn_delta-1.so.0
@@ -138,6 +145,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibaprutil1-0
RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-diff1-0
SPKG_DESC_CSWlibsvn-diff1-0 = Subversion library libsvn_diff-1.so.0
@@ -145,6 +154,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-fs-base1-0
SPKG_DESC_CSWlibsvn-fs-base1-0 = Subversion library libsvn_fs_base-1.so.0
@@ -156,6 +167,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibsvn-delta1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibsvn-fs-util1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-fs-fs1-0
SPKG_DESC_CSWlibsvn-fs-fs1-0 = Subversion library libsvn_fs_fs-1.so.0
@@ -165,6 +178,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibsvn-fs-util1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-fs-util1-0
SPKG_DESC_CSWlibsvn-fs-util1-0 = Subversion library libsvn_fs_util-1.so.0
@@ -172,6 +187,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-fs-x1-0
SPKG_DESC_CSWlibsvn-fs-x1-0 = Subversion library libsvn_fs_x-1.so.0
@@ -181,6 +198,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-fs-util1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-fs1-0
SPKG_DESC_CSWlibsvn-fs1-0 = Subversion library libsvn_fs-1.so.0
@@ -194,6 +213,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-delta1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-util1-0
RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-fs1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-ra-local1-0
SPKG_DESC_CSWlibsvn-ra-local1-0 = Subversion library libsvn_ra_local-1.so.0
@@ -204,6 +225,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-delta1-0
RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-fs1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-ra-serf1-0
SPKG_DESC_CSWlibsvn-ra-serf1-0 = Subversion library libsvn_ra_serf-1.so.0
@@ -215,6 +238,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibexpat1
RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-ra-svn1-0
SPKG_DESC_CSWlibsvn-ra-svn1-0 = Subversion library libsvn_ra_svn-1.so.0
@@ -225,6 +250,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibsasl2-2
RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-ra1-0
SPKG_DESC_CSWlibsvn-ra1-0 = Subversion library libsvn_ra-1.so.0
@@ -237,6 +264,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-delta1-0
RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-ra-serf1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-repos1-0
SPKG_DESC_CSWlibsvn-repos1-0 = Subversion library libsvn_repos-1.so.0
@@ -246,6 +275,8 @@
RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibsvn-fs1-0
RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWlibsvn-subr1-0
SPKG_DESC_CSWlibsvn-subr1-0 = Subversion library libsvn_subr-1.so.0
@@ -267,12 +298,13 @@
RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibsvn-diff1-0
RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-$(GAROSREL)-$(GARCH))
PACKAGES += CSWap2-subversion
SPKG_DESC_CSWap2-subversion = Subversion Modules for Apache 2.2
PKGFILES_CSWap2-subversion += $(prefix)/apache2/.*
PKGFILES_CSWap2-subversion += $(docdir)/$(CATALOGNAME_CSWap2-subversion)/changelog.CSW
-RUNTIME_DEP_PKGS_CSWap2-subversion = CSWsubversion
RUNTIME_DEP_PKGS_CSWap2-subversion += CSWapache2
RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibaprutil1-0
@@ -312,7 +344,7 @@
# This would go away when -norunpath would make it to the linker, but at this point this is difficult.
# Override for now as it is not harmful.
CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/solarisstudio12.3/lib|opt/csw/lib/libsvnjavahl-1.so.0.0.0
-CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/solarisstudio12.3/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/solarisstudio12.3/lib/sparc|opt/csw/lib/libsvnjavahl-1.so.0.0.0
PACKAGES += CSWpm-subversion
SPKG_DESC_CSWpm-subversion = Subversion Perl Language Binding
@@ -349,7 +381,6 @@
CHECKPKG_OVERRIDES_CSWrb-subversion += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsvn_swig_ruby-1.so.0.0.0|soname=libsvn_swig_ruby-1.so.0|pkgname=CSWrb-subversion|expected=CSWlibsvn-swig-ruby1-0
PKGFILES_CSWrb-subversion += $(libdir)/ruby.*
PKGFILES_CSWrb-subversion += $(docdir)/$(CATALOGNAME_CSWrb-subversion)/changelog.CSW
-RUNTIME_DEP_PKGS_CSWrb-subversion += CSWsubversion
RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibintl8
RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-subr1-0
@@ -394,19 +425,10 @@
CHECKPKG_OVERRIDES_CSWpy-subversion += surplus-dependency|CSWpython
CHECKPKG_OVERRIDES_CSWpy-subversion += python-package-missing-py26-files
-CHECKPKG_OVERRIDES_CSWpy-subversion += python-package-missing-py-files
OBSOLETED_BY_CSWpy-subversion = CSWpythonsvn
# This is for /usr/share/lib/zoneinfo
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/subversion/libsvn/_delta.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/subversion/libsvn/_ra.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/subversion/libsvn/_fs.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/subversion/libsvn/_diff.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/subversion/libsvn/_client.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/subversion/libsvn/_core.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/subversion/libsvn/_wc.so
-CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/subversion/libsvn/_repos.so
CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_delta.so
CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_ra.so
CHECKPKG_OVERRIDES_CSWpy-subversion-5.9 += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/subversion/libsvn/_fs.so
@@ -465,6 +487,9 @@
GARCOMPILER-5.10 = SOS12U3
GARCOMPILER += $(GARCOMPILER-$(GAROSREL))
+# There are lots of failing tests, needs more work
+# BUILD64_LIBS_ONLY = 1
+
#NODIRPATHS = --libdir --libexecdir
#CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
CONFIGURE_ARGS += $(DIRPATHS)
@@ -485,9 +510,11 @@
CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec
# No Keyring on Solaris 9
-CONFIGURE_ARGS_5.10 += --with-gnome-keyring=$(prefix)
+CONFIGURE_ARGS-5.10-32 += --with-gnome-keyring=$(prefix)
+# No Keyring in 64 bit at all
+CONFIGURE_ARGS-5.10-64 += --without-gnome-keyring
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)-$(MEMORYMODEL))
# Version from PYTHON modulation
# This is honoured in build/find_python.sh
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