From: Afif Elghraoui Date: Thu, 10 Mar 2016 06:25:29 +0000 (-0800) Subject: Completely fix rpath issue X-Git-Tag: archive/raspbian/0.22.0+ds-1+rpi1~1^2^2~233 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c47196e7939dc762ee25187d47124a9eeeb81716;p=python-pysam.git Completely fix rpath issue --- diff --git a/debian/TODO b/debian/TODO index 681828c..83ce291 100644 --- a/debian/TODO +++ b/debian/TODO @@ -1,7 +1,3 @@ -* Disable rpath setting during build - Cython is producing -R flags to set rpath (see it by grepping the build log). - This should be stopped and checked to make sure that tests still pass. - * Fix tests requiring network access All tests should be passing now. The ones that fail are failing because of network access issues. diff --git a/debian/patches/rpath.patch b/debian/patches/rpath.patch index b6fb0c8..61e3bea 100644 --- a/debian/patches/rpath.patch +++ b/debian/patches/rpath.patch @@ -20,3 +20,13 @@ Last-Update: 2016-03-05 - ext.extra_link_args += ['-Wl,-rpath,$ORIGIN'] build_ext.build_extension(self, ext) +--- python-pysam.orig/setup.py ++++ python-pysam/setup.py +@@ -348,7 +348,6 @@ + shared_htslib_sources + + os_c_files, + library_dirs=htslib_library_dirs, +- runtime_library_dirs=htslib_library_dirs, + include_dirs=["pysam", "."] + include_os + htslib_include_dirs, + libraries=external_htslib_libraries, + language="c",