diff options
| -rw-r--r-- | textproc/libxslt/distinfo | 3 | ||||
| -rw-r--r-- | textproc/libxslt/patches/patch-python_setup.py | 34 | ||||
| -rwxr-xr-x | textproc/py-libxslt/files/setup.py | 9 |
3 files changed, 6 insertions, 40 deletions
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo index 726ecd7ee96..af5f013a7ba 100644 --- a/textproc/libxslt/distinfo +++ b/textproc/libxslt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.58 2017/05/15 18:07:40 dholland Exp $ +$NetBSD: distinfo,v 1.59 2017/05/16 13:51:50 dholland Exp $ SHA1 (libxslt-1.1.29.tar.gz) = edcaeabb3555ae44853bdc406ee9521fb65c620d RMD160 (libxslt-1.1.29.tar.gz) = 40a5202b3967db6b01cd6c0e722a9e459cac7960 @@ -6,4 +6,3 @@ SHA512 (libxslt-1.1.29.tar.gz) = a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f Size (libxslt-1.1.29.tar.gz) = 3428524 bytes SHA1 (patch-ae) = 40ce3940a93b6a2dc804f62676909d3313e0ea52 SHA1 (patch-ah) = f92809ab34e53962ec8b62e50ded7a27c89f10f8 -SHA1 (patch-python_setup.py) = 20b257926a8626bce44ca0448d618619a7d69995 diff --git a/textproc/libxslt/patches/patch-python_setup.py b/textproc/libxslt/patches/patch-python_setup.py deleted file mode 100644 index 29f39990cd2..00000000000 --- a/textproc/libxslt/patches/patch-python_setup.py +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-python_setup.py,v 1.1 2017/05/15 18:07:40 dholland Exp $ - -Fix rpath handling. Needs to link to libxml2mod.so explicitly. - ---- python/setup.py.orig 2017-05-15 18:02:13.012917947 +0000 -+++ python/setup.py -@@ -53,7 +53,7 @@ if xml_includes == "": - iconv_includes="@LIBICONVDIR@/include" - - # those are added in the linker search path for libraries --libdirs = ["@LIBXML2DIR@/lib"] -+libdirs = ["@LIBXML2DIR@/lib", "@PYSHLIBDIR@"] - - xml_files = ["libxml2-api.xml", "libxml2-python-api.xml", - "libxml.c", "libxml.py", "libxml_wrap.h", "types.c", -@@ -132,7 +132,7 @@ descr = "libxml2 package" - modules = [] - c_files = [] - includes= [xml_includes, iconv_includes] --libs = [] + platformLibs -+libs = ["xml2mod"] + platformLibs - macros = [] - if with_threads: - macros.append(('_REENTRANT','1')) -@@ -161,7 +161,8 @@ if with_xslt == 1: - extens=[] - if with_xslt == 1: - extens.append(Extension('libxsltmod', xslt_c_files, include_dirs=includes, -- library_dirs=libdirs, -+ library_dirs=libdirs, -+ runtime_library_dirs=libdirs, - libraries=libs, define_macros=macros)) - - if missing("MANIFEST"): diff --git a/textproc/py-libxslt/files/setup.py b/textproc/py-libxslt/files/setup.py index 623b319ad9a..82f6a4cd861 100755 --- a/textproc/py-libxslt/files/setup.py +++ b/textproc/py-libxslt/files/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/python -u # -# $NetBSD: setup.py,v 1.3 2017/05/16 13:48:05 dholland Exp $ +# $NetBSD: setup.py,v 1.4 2017/05/16 13:51:51 dholland Exp $ # Setup script for libxslt # import sys, os @@ -54,7 +54,7 @@ if xml_includes == "": iconv_includes="@LIBICONVDIR@/include" # those are added in the linker search path for libraries -libdirs = ["@LIBXML2DIR@/lib"] +libdirs = ["@LIBXML2DIR@/lib", "@PYSHLIBDIR@"] xml_files = ["libxml2-api.xml", "libxml2-python-api.xml", "libxml.c", "libxml.py", "libxml_wrap.h", "types.c", @@ -133,7 +133,7 @@ descr = "libxml2 package" modules = [] c_files = [] includes= [xml_includes, iconv_includes] -libs = [] + platformLibs +libs = ["xml2mod"] + platformLibs macros = [] if with_threads: macros.append(('_REENTRANT','1')) @@ -162,7 +162,8 @@ if with_xslt == 1: extens=[] if with_xslt == 1: extens.append(Extension('libxsltmod', xslt_c_files, include_dirs=includes, - library_dirs=libdirs, + library_dirs=libdirs, + runtime_library_dirs=libdirs, libraries=libs, define_macros=macros)) if missing("MANIFEST"): |