svn commit: r367651 - in head/math/gracetmpl: . files
Adam Weinberger
adamw at FreeBSD.org
Mon Sep 8 16:23:57 UTC 2014
Author: adamw
Date: Mon Sep 8 16:23:56 2014
New Revision: 367651
URL: http://svnweb.freebsd.org/changeset/ports/367651
QAT: https://qat.redports.org/buildarchive/r367651/
Log:
Fix python detection.
This port still does not build on 10+.
Modified:
head/math/gracetmpl/Makefile
head/math/gracetmpl/files/patch-Makefile
Modified: head/math/gracetmpl/Makefile
==============================================================================
--- head/math/gracetmpl/Makefile Mon Sep 8 16:22:34 2014 (r367650)
+++ head/math/gracetmpl/Makefile Mon Sep 8 16:23:56 2014 (r367651)
@@ -21,7 +21,8 @@ MAKE_ARGS= PREFIX="${PREFIX}" \
AR="${AR}" \
CPP="${CXX} ${LDFLAGS}" \
CPPFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
- CXX="${CXX}"
+ CXX="${CXX}" \
+ PYTHON="${PYTHON_CMD}"
ALL_TARGET= all pythonwrap
INSTALL_TARGET= install
Modified: head/math/gracetmpl/files/patch-Makefile
==============================================================================
--- head/math/gracetmpl/files/patch-Makefile Mon Sep 8 16:22:34 2014 (r367650)
+++ head/math/gracetmpl/files/patch-Makefile Mon Sep 8 16:23:56 2014 (r367651)
@@ -1,5 +1,5 @@
---- Makefile.orig Mon Sep 27 16:59:48 2004
-+++ Makefile Sun Jun 5 01:14:44 2005
+--- Makefile.orig 2004-09-27 03:59:48.000000000 -0400
++++ Makefile 2014-09-08 12:19:12.246360998 -0400
@@ -58,10 +58,10 @@
$(CPP) -o envtest envtest.o gracetmpl.o
@@ -15,20 +15,23 @@
gracetmpl-config: gracetmpl-config.in Makefile.defs
sed -e 's!__PREFIX__!$(PREFIX)!g' \
-@@ -79,7 +79,7 @@
+@@ -78,16 +78,16 @@
+ rm -f *~ \#*\#
pythonwrap:
- @if python python/prereq.py 2>/dev/null; then \
+- @if python python/prereq.py 2>/dev/null; then \
- (cd python; make); \
++ @if $(PYTHON) python/prereq.py 2>/dev/null; then \
+ (cd python; $(MAKE)); \
else \
echo missing python numarray extension.; \
echo not building python stuff; \
-@@ -87,7 +87,7 @@
+ fi
pythonwrap_install:
- @if python python/prereq.py 2>/dev/null; then \
+- @if python python/prereq.py 2>/dev/null; then \
- (cd python; make install); \
++ @if $(PYTHON) python/prereq.py 2>/dev/null; then \
+ (cd python; $(MAKE) install); \
else \
echo not installing python stuff; \
More information about the svn-ports-all
mailing list