From 6de5f18be3baeccd2c7c4b095a1c09dbecb779a4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 13 Sep 2018 20:13:20 +0200 Subject: [PATCH 1/2] fix static build with libatomic Commit 2ec5a33f6e986661dc92f3585ea400f919a39cae added support to link with -latomic if needed however using LDFLAGS doesn't work when statically linking because LDFLAGS is added before LIBS Detection of atomic fails with: configure:23230: /accts/mlweber1/instance-2/output/host/bin/sparc-linux-g++ -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -static -pedantic -Werror -Wall -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE -Wno-long-long -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -latomic conftest.cpp -lrt -lpthread -lstdc++ >&5 /tmp/ccgrvVTg.o: In function `main': conftest.cpp:(.text.startup+0x10): undefined reference to `__atomic_fetch_add_4' collect2: error: ld returned 1 exit status So use LIBS instead of LDFLAGS Fixes: - http://autobuild.buildroot.net/results/c471d6b1061a8516f7772735e471db68a32965aa Signed-off-by: Fabrice Fontaine --- acinclude.m4 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1993d340..036a30a0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -680,8 +680,8 @@ int main (int, char **) [AC_MSG_RESULT(yes) ; GCC_ATOMIC_BUILTINS_SUPPORTED=1 libzmq_cv_has_atomic_instrisics="yes" ; $1]) if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" != x1; then - save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -latomic" + save_LIBS=$LIBS + LIBS="$LIBS -latomic" AC_LINK_IFELSE([AC_LANG_SOURCE([ /* atomic intrinsics test */ int v = 0; @@ -691,9 +691,8 @@ int main (int, char **) return t; } ])], - [AC_MSG_RESULT(yes) ; libzmq_cv_has_atomic_instrisics="yes" LIBS="-latomic" ; $1], - [AC_MSG_RESULT(no) ; libzmq_cv_has_atomic_instrisics="no"; $2]) - LDFLAGS=$save_LDFLAGS + [AC_MSG_RESULT(yes) ; libzmq_cv_has_atomic_instrisics="yes" ; $1], + [AC_MSG_RESULT(no) ; libzmq_cv_has_atomic_instrisics="no" LIBS=$save_LIBS ; $2]) fi }]) From 3b39942bd0cac5360b68ee48e8cccb293e06a16e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 13 Sep 2018 22:08:53 +0200 Subject: [PATCH 2/2] RELICENSE: Fabrice Fontaine Create RELICENSE/FabriceFontaine.md Signed-off-by: Fabrice Fontaine --- RELICENSE/FabriceFontaine.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 RELICENSE/FabriceFontaine.md diff --git a/RELICENSE/FabriceFontaine.md b/RELICENSE/FabriceFontaine.md new file mode 100644 index 00000000..a64c6305 --- /dev/null +++ b/RELICENSE/FabriceFontaine.md @@ -0,0 +1,15 @@ +# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL + +This is a statement by Fabrice Fontaine +that grants permission to relicense its copyrights in the libzmq C++ +library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other +Open Source Initiative approved license chosen by the current ZeroMQ +BDFL (Benevolent Dictator for Life). + +A portion of the commits made by the Github handle "ffontaine", with +commit author "Fabrice Fontaine ", are copyright of Fabrice Fontaine. +This document hereby grants the libzmq project team to relicense libzmq, +including all past, present and future contributions of the author listed above. + +Fabrice Fontaine +2018-09-13