[117817] trunk/dports/devel/automake

[devans at macports.org]

Revision: 117817
          https://trac.macports.org/changeset/117817
Author:   devans at macports.org
Date:     2014-03-13 15:45:31 -0700 (Thu, 13 Mar 2014)
Log Message:
-----------
automake: patch m4/python.m4 to allow AM_PYTHON_PATH to correctly determine the values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX for the parallel install file structure used by MacPorts, increment revision.

Modified Paths:
--------------
    trunk/dports/devel/automake/Portfile

Added Paths:
-----------
    trunk/dports/devel/automake/files/
    trunk/dports/devel/automake/files/patch-m4-python.m4.diff

Modified: trunk/dports/devel/automake/Portfile
===================================================================
--- trunk/dports/devel/automake/Portfile	2014-03-13 19:16:42 UTC (rev 117816)
+++ trunk/dports/devel/automake/Portfile	2014-03-13 22:45:31 UTC (rev 117817)
@@ -4,6 +4,7 @@
 
 name                automake
 version             1.14.1
+revision            1
 categories          devel
 license             {GPL-2+ Permissive}
 installs_libs       no
@@ -26,6 +27,14 @@
 depends_build       port:autoconf
 depends_lib         path:bin/perl:perl5
 
+# patch m4/python.m4 to allow AM_PYTHON_PATH to correctly
+# determine the values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX
+# for the parallel install file structure used by MacPorts
+# query the Python executable specified in PYTHON rather
+# than assume the standard values prefix and exec_prefix
+
+patchfiles          patch-m4-python.m4.diff
+
 configure.args      --infodir=${prefix}/share/info
 configure.perl      ${prefix}/bin/perl
 

Added: trunk/dports/devel/automake/files/patch-m4-python.m4.diff
===================================================================
--- trunk/dports/devel/automake/files/patch-m4-python.m4.diff	                        (rev 0)
+++ trunk/dports/devel/automake/files/patch-m4-python.m4.diff	2014-03-13 22:45:31 UTC (rev 117817)
@@ -0,0 +1,18 @@
+--- m4/python.m4.orig	2014-03-13 14:25:51.000000000 -0700
++++ m4/python.m4	2014-03-13 14:34:43.000000000 -0700
+@@ -96,8 +96,13 @@
+   dnl distinct variables so they can be overridden if need be.  However,
+   dnl general consensus is that you shouldn't need this ability.
+ 
+-  AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+-  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
++  dnl This is not always true for MacPorts due to the file structure used
++  dnl to install multiple versions of Python in parallel. Rather than
++  dnl assuming the standard values of $prefix and $exec_prefix, we
++  dnl determine them by querying the Python executable specified in $PYTHON
++
++  AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c "import sys; sys.stdout.write(sys.prefix);"`])
++  AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix);"`])
+ 
+   dnl At times (like when building shared libraries) you may want
+   dnl to know which OS platform Python thinks this is.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140313/b197cf62/attachment.html>