[med-svn] [Git][med-team/jellyfish][master] Also fix building with -l and -I in builddir in the existing -L fix

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / jellyfish


Commits:
08b3f10b by Adrian Bunk at 2021-03-02T13:17:02+02:00
Also fix building with -l and -I in builddir in the existing -L fix

- - - - -


1 changed file:

- debian/patches/fix_replacement_of_-L_option.patch


Changes:

=====================================
debian/patches/fix_replacement_of_-L_option.patch
=====================================
@@ -82,12 +82,17 @@ Index: jellyfish/swig/python/setup.py
 ===================================================================
 --- jellyfish.orig/swig/python/setup.py
 +++ jellyfish/swig/python/setup.py
-@@ -23,7 +23,7 @@ def pkgconfig(s):
- jf_libs    = [re.sub(r'-l', '', x) for x in pkgconfig("--libs-only-l jellyfish-2.0")]
- jf_include = [re.sub(r'-I', '', x) for x in pkgconfig("--cflags-only-I jellyfish-2.0")]
+@@ -20,10 +20,10 @@ def pkgconfig(s):
+         exit(1)
+     return res
+ 
+-jf_libs    = [re.sub(r'-l', '', x) for x in pkgconfig("--libs-only-l jellyfish-2.0")]
+-jf_include = [re.sub(r'-I', '', x) for x in pkgconfig("--cflags-only-I jellyfish-2.0")]
++jf_libs    = [re.sub(r'^-l', '', x) for x in pkgconfig("--libs-only-l jellyfish-2.0")]
++jf_include = [re.sub(r'^-I', '', x) for x in pkgconfig("--cflags-only-I jellyfish-2.0")]
  jf_cflags  = pkgconfig("--cflags-only-other jellyfish-2.0")
 -jf_libdir  = [re.sub(r'-L', '', x) for x in pkgconfig("--libs-only-L jellyfish-2.0")]
-+jf_libdir  = [re.sub(r' -L', ' ', x) for x in pkgconfig("--libs-only-L jellyfish-2.0")]
++jf_libdir  = [re.sub(r'^-L', '', x) for x in pkgconfig("--libs-only-L jellyfish-2.0")]
  jf_rpath   = [re.sub(r'^', '-Wl,-rpath,', x) for x in jf_libdir]
  jf_ldflags = pkgconfig("--libs-only-other jellyfish-2.0")
  



View it on GitLab: https://salsa.debian.org/med-team/jellyfish/-/commit/08b3f10b28adaf15ba8c162b86edbb723911c15d

-- 
View it on GitLab: https://salsa.debian.org/med-team/jellyfish/-/commit/08b3f10b28adaf15ba8c162b86edbb723911c15d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210302/0e7037b9/attachment.htm>