[med-svn] [Git][med-team/kent-core][master] Fix some build issues

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / kent-core


Commits:
881e16ad by Andreas Tille at 2023-04-02T13:18:42+02:00
Fix some build issues

- - - - -


2 changed files:

- debian/control
- debian/patches/fix_makefile.patch


Changes:

=====================================
debian/control
=====================================
@@ -4,9 +4,10 @@ Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
+               libmariadb-dev-compat,
                libpng-dev,
-               uuid-dev,
-               libmariadb-dev
+               libssl-dev,
+               uuid-dev
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/med-team/kent-core
 Vcs-Git: https://salsa.debian.org/med-team/kent-core.git


=====================================
debian/patches/fix_makefile.patch
=====================================
@@ -56,6 +56,18 @@ Description: The makefiles contain code that references directories
  
  userApps: $(UTILS_APPLIST:%=%.userApp)
  	cd altSplice/lib && $(MAKE)
+@@ -256,9 +260,9 @@ compile: ${BROWSER_BINS:%=%.compile} ${B
+ 
+ cgi: ${BROWSER_BINS:%=%.bins} ${BROWSER_LOADERS:%=%.cgi} ${ENCODE_FILES:%=%.cgi}
+ %.bins: hgLib
+-	cd $* && echo $* && $(MAKE)
++	if [ -d $* ] ; then cd $* && echo $* && $(MAKE) ; fi
+ %.cgi: hgLib
+-	cd $* && echo $* && $(MAKE) cgi
++	if [ -d $* ] ; then cd $* && echo $* && $(MAKE) cgi ; fi
+ 
+ #   alpha: Destination for the binaries is /usr/local/apache/cgi-bin/
+ 
 @@ -279,22 +283,24 @@ install: ${BROWSER_BINS:%=%.install} ${B
  	cd $* && echo $* && $(MAKE) install
  
@@ -84,3 +96,14 @@ Description: The makefiles contain code that references directories
  
  testAll: $(APPS:%=%.testAll)
  
+--- 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



View it on GitLab: https://salsa.debian.org/med-team/kent-core/-/commit/881e16ad9cbb20d13eb51830c323c311f3c1ade3

-- 
View it on GitLab: https://salsa.debian.org/med-team/kent-core/-/commit/881e16ad9cbb20d13eb51830c323c311f3c1ade3
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/20230402/76278767/attachment-0001.htm>