| 1 |
mr_bones_ 09/09/11 02:40:34 |
| 2 |
|
| 3 |
Added: adonthell-0.3.5-configure.in.patch |
| 4 |
Log: |
| 5 |
version bump (bug #226191) |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: adonthell-0.3.5-configure.in.patch |
| 15 |
=================================================================== |
| 16 |
--- configure.in |
| 17 |
+++ configure.in |
| 18 |
@@ -13,7 +13,7 @@ |
| 19 |
AM_INIT_AUTOMAKE([]) |
| 20 |
AM_CONFIG_HEADER(config.h) |
| 21 |
|
| 22 |
-CFLAGS="-g -Wall -fno-exceptions" |
| 23 |
+CXXFLAGS="$CXXFLAGS -Wall -fno-exceptions" |
| 24 |
CPPFLAGS="" |
| 25 |
DEFS="" |
| 26 |
|
| 27 |
@@ -163,10 +163,8 @@ |
| 28 |
|
| 29 |
dnl Extract the version using Python, check against 2.2+ |
| 30 |
|
| 31 |
- changequote(<<, >>) |
| 32 |
- PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version[0]) * 10 + int(sys.version[2]))'` |
| 33 |
- PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version[0:3]'` |
| 34 |
- changequote([, ]) |
| 35 |
+ PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version@<:@0@:>@) * 10 + int(sys.version@<:@2@:>@))'` |
| 36 |
+ PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version@<:@0:3@:>@'` |
| 37 |
|
| 38 |
if test $PYTHON_VERSION -lt 22; then |
| 39 |
echo "Sorry, you need to have Python 2.2+ installed - update your version!" |
| 40 |
@@ -176,9 +174,7 @@ |
| 41 |
dnl Find the Python.h header file |
| 42 |
|
| 43 |
AC_MSG_CHECKING(for Python header files) |
| 44 |
- changequote(<<, >>) |
| 45 |
- PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version[:3])'` |
| 46 |
- changequote([, ]) |
| 47 |
+ PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version@<:@:3@:>@)'` |
| 48 |
|
| 49 |
if test -r "$PYINCLUDE/Python.h"; then |
| 50 |
PY_CFLAGS="-I$PYINCLUDE" |
| 51 |
@@ -191,10 +187,8 @@ |
| 52 |
dnl Find the Python library |
| 53 |
AC_MSG_CHECKING(for Python library) |
| 54 |
PYLIB="" |
| 55 |
- changequote(<<, >>) |
| 56 |
PYPREFIX=`$PYPACKAGE -c 'import sys; print sys.prefix'` |
| 57 |
- PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version[:3]'` |
| 58 |
- changequote([, ]) |
| 59 |
+ PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version@<:@:3@:>@'` |
| 60 |
|
| 61 |
dnl look for a framework build of python first |
| 62 |
fw=`echo "$PYPREFIX" | sed 's/.*\(Python\.framework\).*/\1/;'` |
| 63 |
@@ -233,19 +227,9 @@ |
| 64 |
fi |
| 65 |
dnl Get the libraries that python depends on |
| 66 |
|
| 67 |
- AC_PATH_PROG(haveldd, ldd) |
| 68 |
AC_MSG_CHECKING(for Python's dependencies) |
| 69 |
|
| 70 |
- if test x$haveldd != x ; then |
| 71 |
- changequote(<<, >>) |
| 72 |
- py_deps=`ldd $PYPACKAGE | sed 's/\( *.*lib\([^\/]*\)\.so.*=.*$\)/-l\2/p; d' | grep -v 'stdc++'` |
| 73 |
- for py_lib in $py_deps ; do |
| 74 |
- if test "$py_lib" != "-lm" && test "$py_lib" != "-lc" ; then |
| 75 |
- PY_DEPS="$PY_DEPS $py_lib" |
| 76 |
- fi |
| 77 |
- done |
| 78 |
- changequote([, ]) |
| 79 |
- fi |
| 80 |
+ PY_DEPS="$PY_DEPS `python-config --libs` -lutil" |
| 81 |
|
| 82 |
case $target in |
| 83 |
*-sun-solaris*) |
| 84 |
@@ -293,11 +277,9 @@ |
| 85 |
if test "$P_SWIG" != "no" ; then |
| 86 |
$P_SWIG -version &> swig.ver |
| 87 |
|
| 88 |
- changequote(<<, >>) |
| 89 |
- swig_major_ver=`more swig.ver | sed 's/.* \([0-9]*\)\.[0-9]*\.[0-9]*.*/\1/p; d'` |
| 90 |
- swig_minor_ver=`more swig.ver | sed 's/.* [0-9]*\.\([0-9]*\)\.[0-9]*.*/\1/p; d'` |
| 91 |
- swig_micro_ver=`more swig.ver | sed 's/.* [0-9]*\.[0-9]*\.\([0-9]*\).*/\1/p; d'` |
| 92 |
- changequote([, ]) |
| 93 |
+ swig_major_ver=`more swig.ver | sed 's/.* \(@<:@0-9@:>@*\)\.@<:@0-9@:>@*\.@<:@0-9@:>@*.*/\1/p; d'` |
| 94 |
+ swig_minor_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.\(@<:@0-9@:>@*\)\.@<:@0-9@:>@*.*/\1/p; d'` |
| 95 |
+ swig_micro_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/p; d'` |
| 96 |
|
| 97 |
rm -f swig.ver |
| 98 |
|
| 99 |
@@ -387,7 +369,7 @@ |
| 100 |
dnl Generate our compiler arguements |
| 101 |
dnl ******************************** |
| 102 |
|
| 103 |
-CXXFLAGS="$CFLAGS $DEFS $INCLUDES" |
| 104 |
+CXXFLAGS="$CXXFLAGS $DEFS $INCLUDES" |
| 105 |
|
| 106 |
AC_SUBST(CXX) |
| 107 |
AC_SUBST(CXXFLAGS) |
Archives