[gentoo-commits] gentoo-x86 commit in dev-libs/newt/files: newt-0.52.13-python.patch newt-0.52.13-gold.patch

[gentoo-commits] gentoo-x86 commit in dev-libs/newt/files: newt-0.52.13-python.patch newt-0.52.13-gold.patch

[Naohiro Aota (naota)]

naota       11/11/17 04:45:45

  Added:                newt-0.52.13-python.patch newt-0.52.13-gold.patch
  Log:
  Version bumped
  
  (Portage version: 2.2.0_alpha73/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-libs/newt/files/newt-0.52.13-python.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/newt/files/newt-0.52.13-python.patch?rev=1.1&view=markup
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

Index: newt-0.52.13-python.patch
===================================================================
diff --git a/configure.ac b/configure.ac
index b972805..1fe4bdf 100644
--- a/configure.ac (revision 34e56d12931a25222d7debb22f95bb2f9fa696a0)
+++ b/configure.ac (revision 49d37f0cc7121a8386e4a8f21e5e0f7b614922b1)
@@ -60,5 +60,5 @@
   PYTHONVERS=
 else
-  PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null)
+  PYTHONVERS=$(ls /usr/include/python2.*/Python.h 2> /dev/null | sed 's|/usr/include/\([[^/]]*\)/Python.h|\1|g' | tr '\n' ' ')
   AC_MSG_RESULT([$PYTHONVERS])
 fi
diff --git a/Makefile.in b/Makefile.in
index a448c5f..f9bbe1f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,11 +79,11 @@ showkey:	showkey.o $(LIBNEWT)
 _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
 	[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
 	    	mkdir -p $$ver ;\
-			PCFLAGS=`$$ver-config --cflags`; \
-			PIFLAGS=`$$ver-config --includes`; \
-			PLDFLAGS=`$$ver-config --ldflags`; \
-			PLFLAGS=`$$ver-config --libs`; \
-	        $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
+			PCFLAGS=`python-config-$${ver#python} --cflags`; \
+			PIFLAGS=`python-config-$${ver#python} --includes`; \
+			PLDFLAGS=`python-config-$${ver#python} --ldflags`; \
+			PLFLAGS=`python-config-$${ver#python} --libs`; \
+	        $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -fPIC -o $$ver/snackmodule.o snackmodule.c ;\
	        $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L.  -lnewt $(LIBS);\
 	done || :
 	touch $@



1.1                  dev-libs/newt/files/newt-0.52.13-gold.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/newt/files/newt-0.52.13-gold.patch?rev=1.1&view=markup
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

Index: newt-0.52.13-gold.patch
===================================================================
--- configure.ac~	2011-11-09 23:50:21.000000000 +0900
+++ configure.ac	2011-11-09 23:54:54.139482817 +0900
@@ -19,7 +19,8 @@
 AC_MSG_CHECKING([for GNU ld])
 LD=`$CC -print-prog-name=ld 2>&5`
 
-if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0; then
+if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0 -a \
+   test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold"` = 0; then
   # Not
   GNU_LD=""
   AC_MSG_RESULT([no])