SF.net SVN: gar:[26782] csw/mgar/pkg/subversion/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 26782
          http://sourceforge.net/p/gar/code/26782
Author:   dmichelsen
Date:     2021-09-08 10:49:21 +0000 (Wed, 08 Sep 2021)
Log Message:
-----------
subversion/trunk: Enable 64 bit

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2021-09-06 16:47:50 UTC (rev 26781)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2021-09-08 10:49:21 UTC (rev 26782)
@@ -60,6 +60,9 @@
 PYTHON = $(bindir)/python$(PYTHON_VERSION)
 MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all
 MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all
+MERGE_SCRIPTS_isa-default64-python_version-2.6 += copy-relocated-only
+MERGE_SCRIPTS_isa-default64-python_version-2.7 += copy-relocated-only
+MERGE_DIRS_isa-default64-python_version-2.7 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
 BUILD_DEP_PKGS += CSWlibexpat-dev
 BUILD_DEP_PKGS += CSWlibsqlite3-dev
@@ -131,6 +134,8 @@
 RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10-sparc += CSWlibiconv2
 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))
+# There is no 64 bit gnome keyring yet
+CHECKPKG_OVERRIDES_CSWlibsvn-auth-gnome-keyring1-0 += 64-bit-binaries-missing
 
 PACKAGES += CSWlibsvn-client1-0
 SPKG_DESC_CSWlibsvn-client1-0 = Subversion library libsvn_client-1.so.0
@@ -350,7 +355,7 @@
 PACKAGES += CSWap24-subversion
 SPKG_DESC_CSWap24-subversion = Subversion Modules for Apache 2.4
 PKGFILES_CSWap24-subversion += $(sysconfdir)/apache2/.*
-PKGFILES_CSWap24-subversion += $(libdir)/apache2/.*
+PKGFILES_CSWap24-subversion += $(call baseisadirs,$(libdir),apache2/.*)
 PKGFILES_CSWap24-subversion += $(docdir)/$(CATALOGNAME_CSWap24-subversion)/changelog.CSW
 RUNTIME_DEP_PKGS_CSWap24-subversion += CSWapache24
 RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibapr1-0
@@ -371,8 +376,9 @@
 # Lets not factor that library out
 PKGFILES_CSWjavasvn += $(call pkgfiles_lib,libsvnjavahl-1.so.0)
 CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjavahl1-0
-PKGFILES_CSWjavasvn += $(libdir)/svn-javahl/svn-javahl.jar
-PKGFILES_CSWjavasvn += $(libdir)/svn-javahl/include.*
+CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjavahl1-0
+PKGFILES_CSWjavasvn += $(call pkgfiles_lib,svn-javahl/svn-javahl.jar)
+PKGFILES_CSWjavasvn += $(call pkgfiles_lib,svn-javahl/include.*)
 PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW 
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWjavasvn-5.9 += CSWlibintl8
@@ -396,6 +402,7 @@
 # Override for now as it is not harmful.
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib|opt/csw/lib/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib/sparc|opt/csw/lib/libsvnjavahl-1.so.0.0.0  
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/developerstudio12.6/lib/amd64|opt/csw/lib/amd64/libsvnjavahl-1.so.0.0.0
 
 PACKAGES += CSWpm-subversion
 SPKG_DESC_CSWpm-subversion = Subversion Perl Language Binding
@@ -421,6 +428,7 @@
 RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWpm-subversion += $(RUNTIME_DEP_PKGS_CSWpm-subversion-$(GAROSREL)-$(GARCH))
+CHECKPKG_OVERRIDES_CSWpm-subversion += 64-bit-binaries-missing
 
 OBSOLETED_BY_CSWpm-subversion += CSWpmsvn
 CATALOGNAME_CSWpmsvn = pm_subversion_stub
@@ -449,6 +457,7 @@
 RUNTIME_DEP_PKGS_CSWrb-subversion += $(RUNTIME_DEP_PKGS_CSWrb-subversion-$(GAROSREL))
 RUNTIME_DEP_PKGS_CSWrb-subversion-5.10-sparc += CSWlibmagic1
 RUNTIME_DEP_PKGS_CSWrb-subversion += $(RUNTIME_DEP_PKGS_CSWrb-subversion-$(GAROSREL)-$(GARCH))
+CHECKPKG_OVERRIDES_CSWrb-subversion += 64-bit-binaries-missing
 
 OBSOLETED_BY_CSWrb-subversion += CSWrbsvn
 
@@ -479,9 +488,10 @@
 RUNTIME_DEP_PKGS_CSWpy-subversion += CSWpython
 RUNTIME_DEP_PKGS_CSWpy-subversion += $(RUNTIME_DEP_PKGS_CSWpy-subversion-$(GAROSREL)-$(GARCH))
 CHECKPKG_OVERRIDES_CSWpy-subversion += surplus-dependency|CSWpython
-
 CHECKPKG_OVERRIDES_CSWpy-subversion += python-package-missing-py26-files
+CHECKPKG_OVERRIDES_CSWpy-subversion += 64-bit-binaries-missing
 
+
 OBSOLETED_BY_CSWpy-subversion = CSWpythonsvn
 
 # This is for /usr/share/lib/zoneinfo
@@ -549,6 +559,7 @@
 
 # There are lots of failing tests, needs more work
 # BUILD64_LIBS_ONLY = 1
+BUILD64 = 1
 
 #NODIRPATHS      = --libdir --libexecdir
 #CONFIGURE_ARGS  = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
@@ -612,9 +623,12 @@
 include gar/category.mk
 
 # pygthon bindings do not link since svn-1.6.5 ...
-BINDING_LANGS-5.9 = perl python ruby
-BINDING_LANGS-5.10 = java perl python ruby
-BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS-$(GAROSREL)))
+BINDING_LANGS-5.9-32 = perl python ruby
+BINDING_LANGS-5.9-64 = perl python ruby
+BINDING_LANGS-5.10-32 = java perl python ruby
+# There is only 64 bit Java at the moment
+BINDING_LANGS-5.10-64 = java
+BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS-$(GAROSREL)-$(MEMORYMODEL)))
 
 PI_DEPENDS += copy-templates
 #PI_DEPENDS += create-ra_dav-symlinks

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