vapier 15/03/03 06:49:14
Added: python-2.7.9-ncurses-pkg-config.patch
python-3.3.5-ncurses-pkg-config.patch
python-3.4.3-ncurses-pkg-config.patch
Log:
Use pkg-config to locate ncurses headers to fix cross-compiling.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.1 dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch?rev=1.1&content-type=text/plain
Index: python-2.7.9-ncurses-pkg-config.patch
===================================================================
do not hardcode /usr/include paths
--- a/configure.ac
+++ b/configure.ac
@@ -4316,7 +4316,7 @@ fi
# first curses configure check
ac_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
AC_CHECK_HEADERS(curses.h ncurses.h)
1.1 dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch?rev=1.1&content-type=text/plain
Index: python-3.3.5-ncurses-pkg-config.patch
===================================================================
do not hardcode /usr/include paths
--- a/configure.ac
+++ b/configure.ac
@@ -668,6 +668,8 @@ AC_ARG_WITH(cxx_main,
])
AC_MSG_RESULT($with_cxx_main)
+AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+
preset_cxx="$CXX"
if test -z "$CXX"
then
@@ -1513,7 +1515,7 @@ dnl AC_MSG_RESULT($cpp_type)
# checks for header files
AC_HEADER_STDC
ac_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
AC_CHECK_HEADERS(asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
fcntl.h grp.h \
ieeefp.h io.h langinfo.h libintl.h ncurses.h process.h pthread.h \
@@ -2225,8 +2227,6 @@ LIBS="$withval $LIBS"
],
[AC_MSG_RESULT(no)])
-AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-
# Check for use of the system expat library
AC_MSG_CHECKING(for --with-system-expat)
AC_ARG_WITH(system_expat,
@@ -4273,7 +4273,7 @@ then
fi
ac_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
# On HP/UX 11.0, mvwdelch is a block with a return statement
AC_MSG_CHECKING(whether mvwdelch is an expression)
AC_CACHE_VAL(ac_cv_mvwdelch_is_expression,
1.1 dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch?rev=1.1&content-type=text/plain
Index: python-3.4.3-ncurses-pkg-config.patch
===================================================================
do not hardcode /usr/include paths
--- a/configure.ac
+++ b/configure.ac
@@ -4402,7 +4402,7 @@ fi
# first curses header check
ac_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`"
AC_CHECK_HEADERS(curses.h ncurses.h)
