| 1 |
vapier 15/03/03 06:49:14 |
| 2 |
|
| 3 |
Added: python-2.7.9-ncurses-pkg-config.patch |
| 4 |
python-3.3.5-ncurses-pkg-config.patch |
| 5 |
python-3.4.3-ncurses-pkg-config.patch |
| 6 |
Log: |
| 7 |
Use pkg-config to locate ncurses headers to fix cross-compiling. |
| 8 |
|
| 9 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch |
| 13 |
|
| 14 |
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 |
| 15 |
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 |
| 16 |
|
| 17 |
Index: python-2.7.9-ncurses-pkg-config.patch |
| 18 |
=================================================================== |
| 19 |
do not hardcode /usr/include paths |
| 20 |
|
| 21 |
--- a/configure.ac |
| 22 |
+++ b/configure.ac |
| 23 |
@@ -4316,7 +4316,7 @@ fi |
| 24 |
|
| 25 |
# first curses configure check |
| 26 |
ac_save_cppflags="$CPPFLAGS" |
| 27 |
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" |
| 28 |
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`" |
| 29 |
|
| 30 |
AC_CHECK_HEADERS(curses.h ncurses.h) |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.1 dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch |
| 36 |
|
| 37 |
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 |
| 38 |
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 |
| 39 |
|
| 40 |
Index: python-3.3.5-ncurses-pkg-config.patch |
| 41 |
=================================================================== |
| 42 |
do not hardcode /usr/include paths |
| 43 |
|
| 44 |
--- a/configure.ac |
| 45 |
+++ b/configure.ac |
| 46 |
@@ -668,6 +668,8 @@ AC_ARG_WITH(cxx_main, |
| 47 |
]) |
| 48 |
AC_MSG_RESULT($with_cxx_main) |
| 49 |
|
| 50 |
+AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
| 51 |
+ |
| 52 |
preset_cxx="$CXX" |
| 53 |
if test -z "$CXX" |
| 54 |
then |
| 55 |
@@ -1513,7 +1515,7 @@ dnl AC_MSG_RESULT($cpp_type) |
| 56 |
# checks for header files |
| 57 |
AC_HEADER_STDC |
| 58 |
ac_save_cppflags="$CPPFLAGS" |
| 59 |
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" |
| 60 |
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`" |
| 61 |
AC_CHECK_HEADERS(asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \ |
| 62 |
fcntl.h grp.h \ |
| 63 |
ieeefp.h io.h langinfo.h libintl.h ncurses.h process.h pthread.h \ |
| 64 |
@@ -2225,8 +2227,6 @@ LIBS="$withval $LIBS" |
| 65 |
], |
| 66 |
[AC_MSG_RESULT(no)]) |
| 67 |
|
| 68 |
-AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
| 69 |
- |
| 70 |
# Check for use of the system expat library |
| 71 |
AC_MSG_CHECKING(for --with-system-expat) |
| 72 |
AC_ARG_WITH(system_expat, |
| 73 |
@@ -4273,7 +4273,7 @@ then |
| 74 |
fi |
| 75 |
|
| 76 |
ac_save_cppflags="$CPPFLAGS" |
| 77 |
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" |
| 78 |
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`" |
| 79 |
# On HP/UX 11.0, mvwdelch is a block with a return statement |
| 80 |
AC_MSG_CHECKING(whether mvwdelch is an expression) |
| 81 |
AC_CACHE_VAL(ac_cv_mvwdelch_is_expression, |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.1 dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch |
| 86 |
|
| 87 |
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 |
| 88 |
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 |
| 89 |
|
| 90 |
Index: python-3.4.3-ncurses-pkg-config.patch |
| 91 |
=================================================================== |
| 92 |
do not hardcode /usr/include paths |
| 93 |
|
| 94 |
--- a/configure.ac |
| 95 |
+++ b/configure.ac |
| 96 |
@@ -4402,7 +4402,7 @@ fi |
| 97 |
|
| 98 |
# first curses header check |
| 99 |
ac_save_cppflags="$CPPFLAGS" |
| 100 |
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" |
| 101 |
+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`" |
| 102 |
|
| 103 |
AC_CHECK_HEADERS(curses.h ncurses.h) |
Archives