SF.net SVN: gar:[25314] csw/mgar/pkg/libxslt/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 25314
          http://sourceforge.net/p/gar/code/25314
Author:   dmichelsen
Date:     2015-10-26 12:11:34 +0000 (Mon, 26 Oct 2015)
Log Message:
-----------
libxslt/trunk: Enable Python modulation

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

Modified: csw/mgar/pkg/libxslt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxslt/trunk/Makefile	2015-10-26 09:18:17 UTC (rev 25313)
+++ csw/mgar/pkg/libxslt/trunk/Makefile	2015-10-26 12:11:34 UTC (rev 25314)
@@ -14,6 +14,17 @@
 
 VENDOR_URL = http://xmlsoft.org/XSLT/
 
+EXTRA_MODULATORS += PYTHON_VERSION
+MODULATIONS_PYTHON_VERSION = 2.6 2.7
+# We need 64 bit just once as it is without python anyway
+SKIP_MODULATIONS += isa-sparcv9-python_version-2.7
+SKIP_MODULATIONS += isa-amd64-python_version-2.7
+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 copy-config-only
+MERGE_DIRS_isa-default64-python_version-2.6 += $(bindir) $(libdir)
+
 BUILD_DEP_PKGS += CSWlibxml2-dev
 BUILD_DEP_PKGS += CSWlibgcrypt-dev
 BUILD_DEP_PKGS += CSWlibgpg-error-dev
@@ -21,9 +32,11 @@
 
 PACKAGES = CSWlibxslt
 SPKG_DESC_CSWlibxslt =  XSLT engine runtime package
+# PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1
 RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibexslt0
+RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibiconv2
 
 PACKAGES += CSWlibxslt-dev
 SPKG_DESC_CSWlibxslt-dev = XSLT engine development package
@@ -41,10 +54,13 @@
 PKGFILES_CSWpy-libxslt = $(libdir)/python.*
 PKGFILES_CSWpy-libxslt += $(docdir)/libxslt-python-$(VERSION)/.*
 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibpython2-7-1-0
 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWpython
 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1
 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0
 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibgcrypt20
 OBSOLETED_BY_CSWpy-libxslt = CSWpylibxslt
 
 # Sadly, yes....
@@ -55,7 +71,8 @@
 SPKG_DESC_CSWlibexslt0 += XSLT engine runtime package, libexslt.so.0
 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxslt1
-RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibgcrypt20
+RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibexslt0-sparc += CSWlibgpg-error0
 RUNTIME_DEP_PKGS_CSWlibexslt0 += $(RUNTIME_DEP_PKGS_CSWlibexslt0-$(GARCH))
 
@@ -64,9 +81,10 @@
 PKGFILES_CSWlibxslt1 += $(call pkgfiles_lib,libxslt.so.1)
 RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2-2
 
-CONFIGURE_ARGS_32 =
+CONFIGURE_ARGS_32 = --with-python=$(PYTHON)
 CONFIGURE_ARGS_64 = --without-python
-CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL))
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
 
 BUILD64 = 1
 ISAEXEC = 1
@@ -74,9 +92,3 @@
 PYCOMPILE = 1
 
 include gar/category.mk
-
-post-merge:
-	@echo Correcting DTD reference in tutorial materials.
-	@( cd $(PKGROOT)$(docdir)/$(NAME)-$(VERSION)/html/tutorial2/; \
-		perl -pi -e 's!/usr/share!/opt/csw/share!' libxslt_pipes.xml)
-	@$(MAKECOOKIE)

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