mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 20:07:25 +00:00
Code Issues Projects Releases Wiki Activity

czmq: bump version 4.1.1 => 4.2.0

Browse Source 
Also, add curl and systemd to PACKAGECONFIG

Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Vincent Prince
2019-04-04 15:58:59 +02:00
committed by Khem Raj
parent b6475aee97
commit 56a3499ea9
2 changed files with 9 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb → meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb
+9 -9
View File
@@ -1,15 +1,13 @@
DESCRIPTION = "C bindings for ZeroMQ" DESCRIPTION = "High-level C binding for 0MQ"
HOMEPAGE = "http://www.zeromq.org" HOMEPAGE = "http://czmq.zeromq.org/"
LICENSE = "MPL-2.0" LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
DEPENDS = "zeromq" DEPENDS = "zeromq"
SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz \ SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz"
file://0001-Problem-out-of-date-with-zproject.patch \
"
SRC_URI[md5sum] = "6d3a6fdd25c2bb29897c53670dce97bf" SRC_URI[md5sum] = "7e09997db6ac3b25e8ed104053040722"
SRC_URI[sha256sum] = "f00ff419881dc2a05d0686c8467cd89b4882677fc56f31c0e2cc81c134cbb0c0" SRC_URI[sha256sum] = "cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb"
inherit cmake inherit cmake
@@ -17,14 +15,16 @@ PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg"
FILES_${PN} = "${bindir}/*" FILES_${PN} = "${bindir}/*"
FILES_lib${BPN} = "${libdir}/*.so.*" FILES_lib${BPN} = "${libdir}/*.so.*"
FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir}" FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${datadir}/cmake"
FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" FILES_lib${BPN}-staticdev = "${libdir}/lib*.a"
RDEPENDS_lib${BPN}-dev = "zeromq-dev" RDEPENDS_lib${BPN}-dev = "zeromq-dev"
PACKAGECONFIG ??= "lz4 uuid" PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4" PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4"
PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux" PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux"
PACKAGECONFIG[curl] = ",-DCMAKE_DISABLE_FIND_PACKAGE_libcurl=TRUE,curl"
PACKAGECONFIG[systemd] = ",-DCMAKE_DISABLE_FIND_PACKAGE_systemd=TRUE,systemd"
BBCLASSEXTEND = "nativesdk" BBCLASSEXTEND = "nativesdk"
meta-oe/recipes-connectivity/zeromq/files/0001-Problem-out-of-date-with-zproject.patch
-31
View File
@@ -1,31 +0,0 @@
From d155ffd33630f80b23c31b3a6e01da221dd9bd13 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Fri, 30 Mar 2018 16:36:22 +0100
Subject: [PATCH] Problem: out of date with zproject
Upstream-Status: backport
Signed-off-by: Adrian Bunk <bunk@stusta.de>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3b81722..4f203461 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ if (NOT CMAKE_BUILD_TYPE)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
message(STATUS "git workspace root [${git_result}]: ${git_root}")
- if ( "${git_result}" == "0" )
+ if ( "${git_result}" STREQUAL "0" )
set (CMAKE_BUILD_TYPE Debug)
else ()
set (CMAKE_BUILD_TYPE Release)
@@ -608,7 +608,7 @@ add_custom_command(
TARGET distclean
)
-include(ClangFormat)
+include(ClangFormat OPTIONAL)
########################################################################
# summary