From a966c86b5c95640f37d2e0861ec971fa2768fa11 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Wed, 30 Aug 2017 17:16:29 +0200 Subject: librcf: link to libatomic In commit 1d594f18f66700f0b2c03b7acf1104a825b155b4: [ librcf: Add -latomic to LDFLAGS ] I added '-latomic' to LDFLAGS, which worked for clang 3.9 but it does not work for clang 5.0, seems the linking order matters for clang 5.0, it should be after -lrcf. Signed-off-by: Ming Liu Signed-off-by: Martin Jansa --- meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch | 2 +- meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'meta-oe') diff --git a/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch b/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch index cd0d1433f..560c3a6d7 100644 --- a/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch +++ b/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch @@ -53,7 +53,7 @@ index 0000000..f6e24be +#################################################################### +INCLUDE (${CMAKE_SOURCE_DIR}/VERSION.cmake) + -+SET (LIBRCF_LIBRARIES "-lpthread -ldl") ++SET (LIBRCF_LIBRARIES "-lpthread -ldl -latomic") +INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/include) + +IF (LIBRCF_USE_OPENSSL) diff --git a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb index 46b75c514..43eff72a3 100644 --- a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb +++ b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb @@ -23,8 +23,6 @@ SRC_URI[sha256sum] = "bbfcc88de502c39604878c395f516b03fff4eac63eb4f7f44c07d43383 S = "${WORKDIR}/RCF-${PV}" -LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" - inherit cmake dos2unix PACKAGECONFIG ?= "zlib openssl sf-serialization boost-filesystem boost-asio protobuf json dll static shared demos" -- cgit v1.2.3-54-g00ecf