cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fence around shell execution variables not to fail abnormally when

Browse Source 
Python segfaults.

Reported by:	jeff
This commit is contained in:
Hye-Shik Chang 2006-06-16 15:43:52 +00:00
parent 1462f68cf9
commit 328a0ca24f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=165580
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mk/bsd.python.mk
View File

@ -224,9 +224,9 @@ _PYTHON_CMD= ${PYTHON_CMD}
.else
_PYTHON_CMD= ${LOCALBASE}/bin/python
.endif
_PYTHON_VERSION!= ${_PYTHON_CMD} -c \
_PYTHON_VERSION!= (${_PYTHON_CMD} -c \
'import sys; print sys.version[:3]' 2> /dev/null \
|| ${ECHO_CMD} ${_PYTHON_PORTBRANCH}
|| ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1
.endif # defined(PYTHON_VERSION)
.if !defined(USE_PYTHON)
@ -284,11 +284,11 @@ _PYTHON_VERSION= ${_PYTHON_PORTBRANCH} # just to avoid version sanity checking.
PYTHON_VERSION?= python${_PYTHON_VERSION}
PYTHON_CMD?= ${_PYTHON_CMD}
PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print sys.prefix') \
2> /dev/null || ${ECHO_CMD} ${LOCALBASE}
PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print sys.prefix' \
2> /dev/null || ${ECHO_CMD} ${LOCALBASE}) | ${TAIL} -1
DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION}
_PYTHON_PORTVERSION!= (${PYTHON_CMD} -c 'import string, sys; \
print string.split(sys.version)[0]') 2> /dev/null || ${TRUE}
print string.split(sys.version)[0]' 2> /dev/null || ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1
.if !defined(PYTHON_NO_DEPENDS) && !empty(_PYTHON_PORTVERSION)
PYTHON_PORTVERSION= ${_PYTHON_PORTVERSION}
.endif