Changeset: c0f2675cccaf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0f2675cccaf
Modified Files:
tools/merovingian/client/Makefile.ag
tools/merovingian/daemon/Makefile.ag
Branch: Jul2012
Log Message:
build-sys: add muuid after msabaoth which consumes it for --as-needed
GNU as-needed throws away symbols included that it didn't need up till
what it has processed, causing msabaoth not to find generateUUID from
muuid, hence move muuid after msabaoth, such that its symbols won't be
thrown away.
diffs (26 lines):
diff --git a/tools/merovingian/client/Makefile.ag
b/tools/merovingian/client/Makefile.ag
--- a/tools/merovingian/client/Makefile.ag
+++ b/tools/merovingian/client/Makefile.ag
@@ -28,8 +28,8 @@ bin_monetdb = {
LIBS = ../utils/libmeroutil \
../../../common/stream/libstream \
../../../common/utils/libmcrypt \
+ ../../../common/utils/libmsabaoth \
../../../common/utils/libmuuid \
- ../../../common/utils/libmsabaoth \
../../../common/utils/libmutils \
$(UUID_LIBS) \
$(openssl_LIBS) \
diff --git a/tools/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
--- a/tools/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -51,8 +51,8 @@ bin_monetdbd = {
../../../common/stream/libstream \
../../../clients/mapilib/libmapi \
../../../common/utils/libmcrypt \
+ ../../../common/utils/libmsabaoth \
../../../common/utils/libmuuid \
- ../../../common/utils/libmsabaoth \
../../../common/utils/libmutils \
$(UUID_LIBS) \
$(curl_LIBS) \
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
