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

[dmichelsen at users.sourceforge.net]

Revision: 25817
          http://sourceforge.net/p/gar/code/25817
Author:   dmichelsen
Date:     2016-07-12 12:24:56 +0000 (Tue, 12 Jul 2016)
Log Message:
-----------
subversion/trunk: Limit to Python 2.7

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2016-07-12 11:10:30 UTC (rev 25816)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2016-07-12 12:24:56 UTC (rev 25817)
@@ -48,7 +48,8 @@
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
 EXTRA_MODULATORS += PYTHON_VERSION
-MODULATIONS_PYTHON_VERSION = 2.6 2.7
+# Subversion requires at least Python 2.7
+MODULATIONS_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
@@ -255,14 +256,16 @@
 CONFIGURE_ARGS += --with-zlib=$(prefix)
 CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec
 
-# Version from PYTHON modulation
-CONFIGURE_ARGS += --with-python=$(PYTHON)
-
 # No Keyring on Solaris 9
 CONFIGURE_ARGS_5.10 += --with-gnome-keyring=$(prefix)
 
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
 
+# Version from PYTHON modulation
+# This is honoured in build/find_python.sh
+EXTRA_CONFIGURE_EXPORTS += PYTHON
+CONFIGURE_ENV_PYTHON = $(PYTHON)
+
 # XXX: Where does this come from?
 #   cc: Warning: illegal option -d=c90
 # The original option is -std=c90, where is it added?

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