[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6734 - in gnuradio/branches/developers/eb/cross: . co
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r6734 - in gnuradio/branches/developers/eb/cross: . config |
|
Date: |
Sun, 28 Oct 2007 23:58:11 -0600 (MDT) |
Author: eb
Date: 2007-10-28 23:58:11 -0600 (Sun, 28 Oct 2007)
New Revision: 6734
Modified:
gnuradio/branches/developers/eb/cross/config/gr_python.m4
gnuradio/branches/developers/eb/cross/configure-cell-cross
gnuradio/branches/developers/eb/cross/configure.ac
Log:
work-in-progress
Modified: gnuradio/branches/developers/eb/cross/config/gr_python.m4
===================================================================
--- gnuradio/branches/developers/eb/cross/config/gr_python.m4 2007-10-29
05:54:51 UTC (rev 6733)
+++ gnuradio/branches/developers/eb/cross/config/gr_python.m4 2007-10-29
05:58:11 UTC (rev 6734)
@@ -22,27 +22,43 @@
# PYTHON_DEVEL()
#
# Checks for Python and tries to get the include path to 'Python.h'.
-# It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) output variables.
+# It sets the $(PYTHON_CPPFLAGS), $(PYTHON_LDFLAGS) and $(pythondir) output
variables,
#
AC_DEFUN([PYTHON_DEVEL],[
AC_REQUIRE([AM_PATH_PYTHON])
AC_REQUIRE([AC_CANONICAL_HOST])
- # For Fedora Core 5 and 6, see ticket:39 in Trac
- if test -f '/etc/redhat-release'; then
- if (echo $pyexecdir | grep -q lib64); then
- pythondir="$pyexecdir"
- fi
- fi
+ AC_ARG_WITH(pythondir,
+ AC_HELP_STRING([--with-pythondir=DIR],
+ [python installation directory (cross-compiling)
[[default=$prefix/lib/python2.5/site-packages]]]),
+
[with_pythondir=${withval}],[with_pythondir=${prefix}/lib/python2.5/site-packages])
- # Check for Python include path
- AC_MSG_CHECKING([for Python include path])
- if test -z "$PYTHON" ; then
- AC_MSG_ERROR([cannot find Python path])
- fi
+ # if we're cross-compiling, asking the host python about any of
+ # this is completely useless...
- # ask distutils which include path we should use
- python_cmd='
+ if test x$cross_compiling != xno
+ then
+ pythondir=$with_pythondir
+ pyexecdir=$with_pythondir
+ AC_SUBST(PYTHON_CPPFLAGS)
+ AC_SUBST(PYTHON_LDFLAGS)
+ else
+
+ # For Fedora Core 5 and 6, see ticket:39 in Trac
+ if test -f '/etc/redhat-release'; then
+ if (echo $pyexecdir | grep -q lib64); then
+ pythondir="$pyexecdir"
+ fi
+ fi
+
+ # Check for Python include path
+ AC_MSG_CHECKING([for Python include path])
+ if test -z "$PYTHON" ; then
+ AC_MSG_ERROR([cannot find Python path])
+ fi
+
+ # ask distutils which include path we should use
+ python_cmd='
import distutils.sysconfig
import os
path = distutils.sysconfig.get_python_inc(plat_specific=False)
@@ -50,30 +66,30 @@
path = path.replace("\\", "/")
print path
'
- python_path=`$PYTHON -c "$python_cmd"`
- AC_MSG_RESULT([$python_path])
- if test -z "$python_path" ; then
- AC_MSG_ERROR([cannot find Python include path])
- fi
+ python_path=`$PYTHON -c "$python_cmd"`
+ AC_MSG_RESULT([$python_path])
+ if test -z "$python_path" ; then
+ AC_MSG_ERROR([cannot find Python include path])
+ fi
- AC_SUBST(PYTHON_CPPFLAGS,[-I$python_path])
+ AC_SUBST(PYTHON_CPPFLAGS,[-I$python_path])
- # Check for Python headers usability
- python_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
- AC_CHECK_HEADERS([Python.h], [],
- [AC_MSG_ERROR([cannot find usable Python headers])])
- CPPFLAGS="$python_save_CPPFLAGS"
+ # Check for Python headers usability
+ python_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
+ AC_CHECK_HEADERS([Python.h], [],
+ [AC_MSG_ERROR([cannot find usable Python headers])])
+ CPPFLAGS="$python_save_CPPFLAGS"
- # Only set this on mingw and cygwin hosts, (only implemented
- # for mingw host, for crosscompiling you need to trick this)
+ # Only set this on mingw and cygwin hosts, (only implemented
+ # for mingw host, for crosscompiling you need to trick this)
- PYTHON_LDFLAGS=""
- case $host_os in
- *mingw* | *cygwin* )
- AC_MSG_CHECKING([for Python LDFLAGS])
+ PYTHON_LDFLAGS=""
+ case $host_os in
+ *mingw* | *cygwin* )
+ AC_MSG_CHECKING([for Python LDFLAGS])
- python_cmd='
+ python_cmd='
import distutils.sysconfig
import os
path = distutils.sysconfig.get_config_var("LIBPL")
@@ -82,30 +98,32 @@
if os.sep == "\\":
path = path.replace("\\", "/")
print path
-'
- python_stdlib_path=`$PYTHON -c "$python_cmd"`
+'
+ python_stdlib_path=`$PYTHON -c "$python_cmd"`
- python_version_nodot=`echo $PYTHON_VERSION | sed "s,\.,,"`
- libpython_name="python$PYTHON_VERSION"
+ python_version_nodot=`echo $PYTHON_VERSION | sed "s,\.,,"`
+ libpython_name="python$PYTHON_VERSION"
- # Standard install of python for win32 has libpython24.a
- # instead of libpython2.4.a so we check for the library
- # without the dot in the version number.
+ # Standard install of python for win32 has libpython24.a
+ # instead of libpython2.4.a so we check for the library
+ # without the dot in the version number.
- python_stdlib_filename=`find $python_stdlib_path -type f -name
libpython$python_version_nodot.* -print | sed "1q"`
- if test -n "$python_stdlib_filename" ; then
- libpython_name="python$python_version_nodot"
- fi
+ python_stdlib_filename=`find $python_stdlib_path -type f -name
libpython$python_version_nodot.* -print | sed "1q"`
+ if test -n "$python_stdlib_filename" ; then
+ libpython_name="python$python_version_nodot"
+ fi
- PYTHON_LDFLAGS="-L$python_stdlib_path -l$libpython_name"
- AC_MSG_RESULT($PYTHON_LDFLAGS)
- # Replace all backslashes in PYTHON Paths with forward slashes
- pythondir=`echo $pythondir |sed 's,\\\\,/,g'`
- pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'`
- pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'`
- pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'`
- ;;
- esac
+ PYTHON_LDFLAGS="-L$python_stdlib_path -l$libpython_name"
+ AC_MSG_RESULT($PYTHON_LDFLAGS)
+ # Replace all backslashes in PYTHON Paths with forward slashes
+ pythondir=`echo $pythondir |sed 's,\\\\,/,g'`
+ pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'`
+ pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'`
+ pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'`
+ ;;
+ esac
- AC_SUBST([PYTHON_LDFLAGS])
+ AC_SUBST([PYTHON_LDFLAGS])
+
+ fi
])
Modified: gnuradio/branches/developers/eb/cross/configure-cell-cross
===================================================================
--- gnuradio/branches/developers/eb/cross/configure-cell-cross 2007-10-29
05:54:51 UTC (rev 6733)
+++ gnuradio/branches/developers/eb/cross/configure-cell-cross 2007-10-29
05:58:11 UTC (rev 6734)
@@ -1,10 +1,28 @@
-#!/bin/sh
+#!/bin/bash
scriptdir=`dirname $0`
+prefix=
+for arg in "$@"
+do
+ case $arg in
+ --prefix=*)
+ prefix=${arg#--prefix=}
+ ;;
+ esac
+done
+
+if test x$prefix = x
+then
+ echo "usage: $0 --prefix=PREFIX [configure options...]" 1>&2
+ exit 1
+fi
+
+
arch=ppu
# cell_root=/mnt/ps3
cell_root=/opt/cell-root-snapshot
+python_version=2.5
$scriptdir/configure \
CC=${arch}32-gcc \
@@ -16,7 +34,9 @@
F77=false \
CPPFLAGS=-I${cell_root}/usr/include \
LDFLAGS="-L${cell_root}/lib -L${cell_root}/usr/lib"
\
+ PYTHON_CPPFLAGS=-I${cell_root}/usr/include/python${python_version}
\
PKG_CONFIG_PATH=${cell_root}/usr/lib/pkgconfig:${cell_root}/usr/local/lib/pkgconfig
\
- --prefix=/home/eb/cell-prefix \
- --host=powerpc64-unknown-linux-gnu
+ --host=powerpc64-unknown-linux-gnu \
+ --prefix=$prefix \
+ --with-pythondir=$prefix/lib/python${python_version}/site-packages
Modified: gnuradio/branches/developers/eb/cross/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/cross/configure.ac 2007-10-29 05:54:51 UTC
(rev 6733)
+++ gnuradio/branches/developers/eb/cross/configure.ac 2007-10-29 05:58:11 UTC
(rev 6734)
@@ -108,7 +108,7 @@
if test x$CXX_FOR_BUILD = x
then
- if x$cross_compiling = xno; then
+ if test x$cross_compiling = xno; then
CXX_FOR_BUILD=${CXX}
else
CXX_FOR_BUILD=g++
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6734 - in gnuradio/branches/developers/eb/cross: . config,
eb <=