From 364ffbfd68c4c4f754046765ad2df372c7f9fa19 Mon Sep 17 00:00:00 2001 From: drochner Date: Sat, 19 Jan 2002 17:44:04 +0000 Subject: point "configure" to the right python interpreter --- finance/emma/Makefile | 3 ++- finance/emma/distinfo | 3 ++- finance/emma/patches/patch-af | 49 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 finance/emma/patches/patch-af (limited to 'finance') diff --git a/finance/emma/Makefile b/finance/emma/Makefile index 30a9fe947f8..c188f0b3f1a 100644 --- a/finance/emma/Makefile +++ b/finance/emma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/01/15 18:31:14 drochner Exp $ +# $NetBSD: Makefile,v 1.11 2002/01/19 17:44:04 drochner Exp $ # DISTNAME= emma-0.8-1 @@ -19,6 +19,7 @@ GNU_CONFIGURE= YES USE_GMAKE= YES USE_LIBINTL= yes BUILD_USES_MSGFMT= yes +CONFIGURE_ENV+= PYTHONBIN=${PYTHONBIN} PYTHON_VERSIONS_ACCEPTED= 20 diff --git a/finance/emma/distinfo b/finance/emma/distinfo index 00ed5db17ef..cac9d1053c6 100644 --- a/finance/emma/distinfo +++ b/finance/emma/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2001/07/02 16:09:43 drochner Exp $ +$NetBSD: distinfo,v 1.8 2002/01/19 17:44:04 drochner Exp $ SHA1 (emma-0.8-1.tar.gz) = 06c0216a441511b88c36d7d600b9e6e5b443f6d3 Size (emma-0.8-1.tar.gz) = 409664 bytes @@ -7,3 +7,4 @@ SHA1 (patch-ab) = b40e3014cd9287aebf3c19759edc2d4ddcbf9ffe SHA1 (patch-ac) = 0c096fc00992f49eea170003ba6f6cc9307d884c SHA1 (patch-ad) = 5e0e39e13b2de33942fce6d5d3d72d7755139851 SHA1 (patch-ae) = 9d624620c2702a1a2b6888a715e5ac3e63b21f96 +SHA1 (patch-af) = c5a0980ef064c86f40aeefb807f842aae23ec4d9 diff --git a/finance/emma/patches/patch-af b/finance/emma/patches/patch-af new file mode 100644 index 00000000000..8373d6063ff --- /dev/null +++ b/finance/emma/patches/patch-af @@ -0,0 +1,49 @@ +$NetBSD: patch-af,v 1.1 2002/01/19 17:44:06 drochner Exp $ + +--- configure.orig Sat Jan 19 18:36:50 2002 ++++ configure Sat Jan 19 18:38:12 2002 +@@ -3062,40 +3062,12 @@ + + + +-# Extract the first word of "python", so it can be a program name with args. +-set dummy python; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3069: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_python_val'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- if test -n "$python_val"; then +- ac_cv_prog_python_val="$python_val" # Let the user override the test. +-else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_python_val="true" +- break +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_prog_python_val" && ac_cv_prog_python_val="false" +-fi +-fi +-python_val="$ac_cv_prog_python_val" +-if test -n "$python_val"; then +- echo "$ac_t""$python_val" 1>&6 +-else +- echo "$ac_t""no" 1>&6 +-fi ++python_val=true + + if $python_val; then +- PY_PREFIX=`python -c 'import sys ; print sys.prefix'` +- PY_EXEC_PREFIX=`python -c 'import sys ; print sys.exec_prefix'` +- PY_VERSION=`python -c 'import sys ; print sys.version[0:3]'` ++ PY_PREFIX=`${PYTHONBIN} -c 'import sys ; print sys.prefix'` ++ PY_EXEC_PREFIX=`${PYTHONBIN} -c 'import sys ; print sys.exec_prefix'` ++ PY_VERSION=`${PYTHONBIN} -c 'import sys ; print sys.version[0:3]'` + if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then + PY_LIBS="-lpython$PY_VERSION" + PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config" -- cgit v1.2.3