From 80b08877ffb7e685666d47daededba8d5d6e6943 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Wed, 29 May 2013 13:30:35 +1000 Subject: [PATCH] libxml2-python-32: include updated patch --- libxml2-python-32/libxml2-python-config.patch | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/libxml2-python-32/libxml2-python-config.patch b/libxml2-python-32/libxml2-python-config.patch index f88c9d04..42713109 100644 --- a/libxml2-python-32/libxml2-python-config.patch +++ b/libxml2-python-32/libxml2-python-config.patch @@ -1,21 +1,12 @@ -diff -Nru libxml2-2.9.0.orig/python/Makefile.in libxml2-2.9.0/python/Makefile.in ---- libxml2-2.9.0.orig/python/Makefile.in 2012-09-14 10:22:28.919971395 +0200 -+++ libxml2-2.9.0/python/Makefile.in 2012-09-14 10:23:40.717353028 +0200 -@@ -82,7 +82,7 @@ - LTLIBRARIES = $(python_LTLIBRARIES) - am__DEPENDENCIES_1 = - @WITH_PYTHON_TRUE@libxml2mod_la_DEPENDENCIES = \ --@WITH_PYTHON_TRUE@ $(top_builddir)/libxml2.la \ -+@WITH_PYTHON_TRUE@ $(libdir)/libxml2.la \ - @WITH_PYTHON_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - @WITH_PYTHON_TRUE@ $(am__DEPENDENCIES_1) - am__libxml2mod_la_SOURCES_DIST = libxml.c libxml_wrap.h libxml2-py.h \ -@@ -416,7 +416,7 @@ - +diff -Nru libxml2-2.9.1.orig/python/Makefile.in libxml2-2.9.1/python/Makefile.in +--- libxml2-2.9.1.orig/python/Makefile.in 2013-04-19 09:58:10.989142606 +0200 ++++ libxml2-2.9.1/python/Makefile.in 2013-04-19 10:02:26.390025067 +0200 +@@ -435,7 +435,7 @@ @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c --@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) -lpython$(PYTHON_VERSION) -+@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(libdir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) -lpython$(PYTHON_VERSION) - @WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version + @WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \ +-@WITH_PYTHON_TRUE@ $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) ++@WITH_PYTHON_TRUE@ $(libdir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) + @WITH_PYTHON_TRUE@BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c @WITH_PYTHON_TRUE@dist_python_DATA = \