Changeset: 359a1cf86a08 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=359a1cf86a08
Modified Files:
clients/mapilib/Makefile.ag
debian/fix-deb.sh
Branch: Aug2018
Log Message:
Fix trusty build.
diffs (25 lines):
diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -16,7 +16,7 @@ lib_mapi = {
../../common/utils/libmcrypt \
WIN32?../../common/stream/libstream \
WIN32?$(SOCKET_LIBS) \
- $(openssl_LIBS)
+ WIN32?$(openssl_LIBS)
}
headers_mapi = {
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -65,8 +65,6 @@ wheezy)
trusty)
# the trusty linker produces unresolved references to openSSL functions
sed -i '/openssl_LIBS/s/WIN32?//' clients/mapilib/Makefile.ag
- lib=$(grep openssl_LIBS clients/mapilib/Makefile.am)
- lib="${lib%% *}"
- sed -i "s/\\\$($lib)/\$(openssl_LIBS)/g" clients/mapilib/Makefile.am
clients/mapilib/Makefile.in
+ sed -i '/^libmapi_la_LIBADD/s/$/ $(openssl_LIBS)/'
clients/mapilib/Makefile.am clients/mapilib/Makefile.in
;;
esac
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
