| 1 |
naota 11/11/17 04:45:45 |
| 2 |
|
| 3 |
Added: newt-0.52.13-python.patch newt-0.52.13-gold.patch |
| 4 |
Log: |
| 5 |
Version bumped |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/newt/files/newt-0.52.13-python.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/newt/files/newt-0.52.13-python.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/newt/files/newt-0.52.13-python.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: newt-0.52.13-python.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/configure.ac b/configure.ac |
| 18 |
index b972805..1fe4bdf 100644 |
| 19 |
--- a/configure.ac (revision 34e56d12931a25222d7debb22f95bb2f9fa696a0) |
| 20 |
+++ b/configure.ac (revision 49d37f0cc7121a8386e4a8f21e5e0f7b614922b1) |
| 21 |
@@ -60,5 +60,5 @@ |
| 22 |
PYTHONVERS= |
| 23 |
else |
| 24 |
- PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null) |
| 25 |
+ PYTHONVERS=$(ls /usr/include/python2.*/Python.h 2> /dev/null | sed 's|/usr/include/\([[^/]]*\)/Python.h|\1|g' | tr '\n' ' ') |
| 26 |
AC_MSG_RESULT([$PYTHONVERS]) |
| 27 |
fi |
| 28 |
diff --git a/Makefile.in b/Makefile.in |
| 29 |
index a448c5f..f9bbe1f 100644 |
| 30 |
--- a/Makefile.in |
| 31 |
+++ b/Makefile.in |
| 32 |
@@ -79,11 +79,11 @@ showkey: showkey.o $(LIBNEWT) |
| 33 |
_snackmodule.so: snackmodule.c $(LIBNEWTSH) |
| 34 |
[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \ |
| 35 |
mkdir -p $$ver ;\ |
| 36 |
- PCFLAGS=`$$ver-config --cflags`; \ |
| 37 |
- PIFLAGS=`$$ver-config --includes`; \ |
| 38 |
- PLDFLAGS=`$$ver-config --ldflags`; \ |
| 39 |
- PLFLAGS=`$$ver-config --libs`; \ |
| 40 |
- $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\ |
| 41 |
+ PCFLAGS=`python-config-$${ver#python} --cflags`; \ |
| 42 |
+ PIFLAGS=`python-config-$${ver#python} --includes`; \ |
| 43 |
+ PLDFLAGS=`python-config-$${ver#python} --ldflags`; \ |
| 44 |
+ PLFLAGS=`python-config-$${ver#python} --libs`; \ |
| 45 |
+ $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -fPIC -o $$ver/snackmodule.o snackmodule.c ;\ |
| 46 |
$(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L. -lnewt $(LIBS);\ |
| 47 |
done || : |
| 48 |
touch $@ |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.1 dev-libs/newt/files/newt-0.52.13-gold.patch |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/newt/files/newt-0.52.13-gold.patch?rev=1.1&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/newt/files/newt-0.52.13-gold.patch?rev=1.1&content-type=text/plain |
| 56 |
|
| 57 |
Index: newt-0.52.13-gold.patch |
| 58 |
=================================================================== |
| 59 |
--- configure.ac~ 2011-11-09 23:50:21.000000000 +0900 |
| 60 |
+++ configure.ac 2011-11-09 23:54:54.139482817 +0900 |
| 61 |
@@ -19,7 +19,8 @@ |
| 62 |
AC_MSG_CHECKING([for GNU ld]) |
| 63 |
LD=`$CC -print-prog-name=ld 2>&5` |
| 64 |
|
| 65 |
-if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0; then |
| 66 |
+if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0 -a \ |
| 67 |
+ test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold"` = 0; then |
| 68 |
# Not |
| 69 |
GNU_LD="" |
| 70 |
AC_MSG_RESULT([no]) |
Archives