[med-svn] [Git][med-team/unifrac-tools][master] 2 commits: Do not pass -noshlib to ldflags

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / unifrac-tools


Commits:
9cdf55b2 by Nilesh Patra at 2023-01-03T21:03:05+05:30
Do not pass -noshlib to ldflags

- - - - -
5ff6dcb9 by Nilesh Patra at 2023-01-03T21:03:20+05:30
Interim d/ch

- - - - -


3 changed files:

- debian/changelog
- debian/patches/enable_linking_to_shared_hdf5_lib.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,17 @@
 unifrac-tools (1.2-1) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * Fix Homepage
     Closes: #1026296
   * New upstream version
   * Standards-Version: 4.6.2 (routine-update)
+  * Apply multi-arch hints. + libssu-dev: Add Multi-Arch: same.
+  * Refresh patches
 
- -- Andreas Tille <tille at debian.org>  Mon, 02 Jan 2023 07:47:01 +0100
+  [ Nilesh Patra ]
+  * Do not pass -noshlib to ldflags
+
+ -- Nilesh Patra <nilesh at debian.org>  Tue, 03 Jan 2023 21:03:08 +0530
 
 unifrac-tools (1.1.3-2) unstable; urgency=medium
 


=====================================
debian/patches/enable_linking_to_shared_hdf5_lib.patch
=====================================
@@ -5,7 +5,7 @@ Description: Enable linking ro shared hdf5 library
 
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -44,7 +44,7 @@ else
+@@ -44,7 +44,7 @@
  	MPFLAG = -fopenmp
  endif
  
@@ -14,3 +14,14 @@ Description: Enable linking ro shared hdf5 library
  CPPFLAGS += $(MPFLAG)
  
  UNIFRAC_FILES = unifrac_internal.o unifrac_cmp_cpu.o
+@@ -110,8 +110,8 @@
+ 	$(CXX) $(CPPFLAGS) $(EXEFLAGS) faithpd.cpp -o faithpd tree.o biom.o $(UNIFRAC_FILES) unifrac.o cmd.o skbio_alt.o api.o -lhdf5_cpp -llz4 $(BLASLIB) -lpthread
+ 
+ libssu.so: tree.o biom.o unifrac.o cmd.o skbio_alt.o api.o $(UNIFRAC_FILES)
+-#	$(CXX) $(LDDFLAGS) -o libssu.so tree.o biom.o $(UNIFRAC_FILES) unifrac.o cmd.o skbio_alt.o api.o -lc -llz4 $(BLASLIB) -L$(PREFIX)/lib -noshlib -lhdf5_cpp -lhdf5_hl_cpp -lhdf5_hl -lhdf5
+-	$(CXX) $(LDDFLAGS) -o libssu.so.0 tree.o biom.o $(UNIFRAC_FILES) unifrac.o cmd.o skbio_alt.o api.o -lc -llz4 -shlib -Wl,-soname,libssu.so.0 $(BLASLIB) -L$(PREFIX)/lib -noshlib -lhdf5_cpp -lhdf5_hl_cpp -lhdf5_hl -lhdf5
++#	$(CXX) $(LDDFLAGS) -o libssu.so tree.o biom.o $(UNIFRAC_FILES) unifrac.o cmd.o skbio_alt.o api.o -lc -llz4 $(BLASLIB) -L$(PREFIX)/lib -lhdf5_cpp -lhdf5_hl_cpp -lhdf5_hl -lhdf5
++	$(CXX) $(LDDFLAGS) -o libssu.so.0 tree.o biom.o $(UNIFRAC_FILES) unifrac.o cmd.o skbio_alt.o api.o -lc -llz4 -shlib -Wl,-soname,libssu.so.0 $(BLASLIB) -L$(PREFIX)/lib -lhdf5_cpp -lhdf5_hl_cpp -lhdf5_hl -lhdf5
+ 	ln -sf libssu.so.0 libssu.so
+ 	# FIXME: Should build static lib as well
+ 	# $(CXX) $(LDDFLAGS) -o libssu.a tree.o biom.o $(UNIFRAC_FILES) unifrac.o cmd.o skbio_alt.o api.o -lc -lhdf5_cpp -llz4 $(BLASLIB) -L$(PREFIX)/lib


=====================================
debian/patches/series
=====================================
@@ -1,5 +1,5 @@
 remove_non-free_headers.patch
-enable_linking_to_shared_hdf5_lib.patch
 python3.patch
 soname.patch
 baseline.patch
+enable_linking_to_shared_hdf5_lib.patch



View it on GitLab: https://salsa.debian.org/med-team/unifrac-tools/-/compare/02476ce413e2682a3625b753b37e8caa0ced8550...5ff6dcb98426e24e3a3071fef6f9a8cd4e785cec

-- 
View it on GitLab: https://salsa.debian.org/med-team/unifrac-tools/-/compare/02476ce413e2682a3625b753b37e8caa0ced8550...5ff6dcb98426e24e3a3071fef6f9a8cd4e785cec
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/20230103/47424fe9/attachment-0001.htm>