[med-svn] [Git][med-team/libucsc][master] Fix build

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / libucsc


Commits:
c79f9b61 by Andreas Tille at 2023-09-15T19:55:36+02:00
Fix build

- - - - -


3 changed files:

- + debian/patches/libssl_shared.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/patches/libssl_shared.patch
=====================================
@@ -0,0 +1,16 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 14 Sep 2023 06:22:31 +0200
+Description: Do not mix shared and static libs when linking
+ Thanks to Gianfranco Costamagna for pointing this out on debian-mentors)
+
+--- a/src/inc/common.mk
++++ b/src/inc/common.mk
+@@ -156,7 +156,7 @@ else
+          L+=/opt/local/lib/libssl.a
+        else
+          ifneq ($(wildcard /usr/lib/x86_64-linux-gnu/libssl.a),)
+-	   L+=/usr/lib/x86_64-linux-gnu/libssl.a
++	   L+=-lssl
+          else
+            ifneq ($(wildcard /usr/local/opt/openssl/lib/libssl.a),)
+               L+=/usr/local/opt/openssl/lib/libssl.a


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@ jkhgap_is_not_available.patch
 fix_makefile.patch
 python2.patch
 spelling.patch
+libssl_shared.patch


=====================================
debian/rules
=====================================
@@ -21,9 +21,9 @@ override_dh_auto_build:
 	make --directory=src/jkOwnLib
 	make --directory=src/lib
 	mkdir -p $(DESTDIR)/bin
-# FIXME: blat and isPcr are non-free and currently are showing issues with libssl 3.x  Deactivating this part of the build for the moment
-#	make --directory=src/blat
-#	make --directory=src/isPcr/isPcr
+# FIXME: blat and isPcr are non-free but needed inside the build
+	make --directory=src/blat
+	make --directory=src/isPcr/isPcr
 	#make --directory=src/utils/faToTwoBit
 	#make --directory=src/utils/twoBitToFa
 	make --directory=src/utils



View it on GitLab: https://salsa.debian.org/med-team/libucsc/-/commit/c79f9b61537205a02d10983f6968f3a83b159811

-- 
View it on GitLab: https://salsa.debian.org/med-team/libucsc/-/commit/c79f9b61537205a02d10983f6968f3a83b159811
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/20230915/f553276c/attachment-0001.htm>