From d221e0389dc9bafd72e541090a9c401a25a84ce3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Jul 2020 16:13:21 -0500 Subject: meta-openembedded: subtree update:629696b64b..e93d527a33 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian (1): firewalld: upgrade 0.7.3 -> 0.7.5 Andre Carvalho (1): netcat: Set CVE_PRODUCT Andreas Müller (6): networkmanager: upgrade 1.22.10 -> 1.22.14 blueman: upgrade 2.1.1 -> 2.1.3 modemmanager: upgrade 1.12.10 -> 1.12.12 ibus: upgrade 1.5.21 -> 1.5.22 network-manager-applet: upgrade 1.16.0 -> 1.18.0 sysprof: remove linux-gnueabi-patch Armin Kuster (2): net-snmp: Security fix CVE-2019-20892 wireshark: Update to 3.2.5 Changqing Li (1): libmcrypt: set CLEANBROKEN Daniel Gomez (1): ttf-fonts: Update ttf-ubuntu-font-family recipe Fagundes, Paulo (1): redis-plus-plus: add recipe Hongxu Jia (1): networkmanager: fix Files/directories were installed but not shipped Jacopo Dall'Aglio (2): netplan: upgrade 0.98 -> 0.99 python3-libconf: add recipe version 2.0.1 Khem Raj (1): lirc: Inherit distutils-common-base Konrad Weihmann (6): ntop: remove static libs from dev package ruli: recipe cleanup postgresql: remove vacuumlo from contrib libconfig: remove cmake append from base package gattlib: remove includedir from base package openldap: packaging fixes Leon Anavi (63): python3-pyro4: Upgrade 4.77 -> 4.80 python3-rdflib: Upgrade 4.2.2 -> 5.0.0 python3-httplib2: Upgrade 0.17.3 -> 0.18.1 python3-cppy: Add new recipe python3-kiwisolver: Upgrade 1.1.0 -> 1.2.0 python3-sqlalchemy: Upgrade 1.3.17 -> 1.3.18 python3-greenlet: Upgrade 0.4.15 -> 0.4.16 python3-pkgconfig: Upgrade 1.4.0 -> 1.5.1 python3-msm: Upgrade 0.8.3 -> 0.8.7 python3-pulsectl: Upgrade 20.2.4 -> 20.5.1 python3-pybind11: Consolidate in a single file python3-pybind11: Upgrade 2.4.3 -> 2.5.0 python3-pyparted: Consolidate in a single file python3-pyparted: Upgrade 3.11.3 -> 3.11.6 python3-pywbem: Consolidate in a single file python3-pywbem: Upgrade 0.15.0 -> 0.17.2 python3-jsonrpcserver: Upgrade 4.1.2 -> 4.1.3 python3-humanize: Upgrade 2.4.0 -> 2.4.1 python3-autobahn: Upgrade 20.4.3 -> 20.6.2 python3-yappi: Upgrade 1.0 -> 1.2.5 python3-sympy: Upgrade 1.5.1 -> 1.6 python3-watchdog: Upgrade 0.10.2 -> 0.10.3 python3-tqdm: Upgrade 4.43.0 -> 4.47.0 python3-pyflakes: Upgrade 2.1.1 -> 2.2.0 python3-pymisp: Upgrade 2.4.122 -> 2.4.128 python3-pychromecast: Upgrade 4.2.3 -> 7.0.1 python3-py: Upgrade 1.8.2 -> 1.9.0 python3-html5lib: Upgrade 1.0.1 -> 1.1 python3-lz4: Upgrade 3.0.2 -> 3.1.0 python3-cassandra-driver: Upgrade 3.14.0 -> 3.24.0 python3-configargparse: Upgrade 0.15.1 -> 1.2.3 python3-cachetools: Upgrade 4.1.0 -> 4.1.1 python3-keras-preprocessing: Upgrade 1.1.0 -> 1.1.2 python3-pywbem: Upgrade 0.17.2 -> 0.17.3 python3-h2: Consolidate in a single file python3-h2: Upgrade 3.1.1 -> 3.2.0 python3-requests: Upgrade 2.23.0 -> 2.24.0 python3-google-api-python-client: Upgrade 1.7.11 -> 1.9.3 python3-pyperclip: Upgrade 1.7.0 -> 1.8.0 python3-pyhamcrest: Upgrade 1.9.0 -> 2.0.2 python3-pint: Upgrade 0.13 -> 0.14 python3-dbus-next: Upgrade 0.1.2 -> 0.1.3 python3-pybluez: Upgrade 0.22 -> 0.23 python3-stevedore: Upgrade 1.31.0 -> 2.0.1 python3-h5py: Upgrade 2.9.0 -> 2.10.0 python3-cryptography-vectors: Upgrade 2.8 -> 2.9.2 python3-importlib-metadata: Upgrade 1.6.1 -> 1.7.0 python3-websocket-client: Upgrade 0.56.0 -> 0.57.0 python3-sentry-sdk: Upgrade 0.14.0 -> 0.16.0 python3-regex: Upgrade 2020.1.8 -> 2020.6.8 python3-python-vlc: Upgrade 3.0.9113 -> 3.0.10114 python3-robotframework: Upgrade 3.0.4 -> 3.2.1 python3-pychromecast: Upgrade 7.0.1 -> 7.1.0 python3-pyasn1-modules: Consolidate in a single file python3-pyasn1-modules: Upgrade 0.2.7 -> 0.2.8 python3-sympy: Upgrade 1.6 -> 1.6.1 python3-pychromecast: Upgrade 7.1.0 -> 7.1.1 python3-imageio: Upgrade 2.8.0 -> 2.9.0 python3-humanize: Upgrade 2.4.1 -> 2.5.0 python3-tinyrecord: Upgrade 0.1.5 -> 0.2.0 python3-luma-oled: Upgrade 3.4.0 -> 3.5.0 python3-pyconnman: Consolidate in a single file python3-jsonref: Consolidate in a single file Pierre-Jean Texier (4): minicoredumper: update SRC_URI to use github instead tslib: upgrade 1.21 -> 1.22 haveged: upgrade 1.9.9 -> 1.9.13 xxhash: upgrade 0.7.3 -> 0.7.4 Qi.Chen@windriver.com (1): multipath-tools: disable parallel build as a workaround Robert Yang (1): drbd-utils: Add CLEANBROKEN to fix rebuild errors Sakib Sajal (2): python3-betamax: add recipe cunit: add ptest Wang Mingyu (2): nspr: upgrade 4.25 -> 4.26 python3-pytest: upgrade 5.4.2 -> 5.4.3 Zang Ruochen (20): python3-ansicolors: Enable ptest python3-anyjson: Enable ptest python3-atomicwrites: upgrade 1.3.0 -> 1.4.0 python3-backports-functools-lru-cache: Enable ptest python3-bcrypt: Enable ptest nftables: upgrade 0.9.5 -> 0.9.6 ccid: upgrade 1.4.32 -> 1.4.33 docopt.cpp: upgrade 0.6.2 -> 0.6.3 libiio: upgrade 0.20 -> 0.21 librelp: upgrade 1.5.0 -> 1.6.0 redis: upgrade 6.0.4 -> 6.0.5 rsyslog: upgrade 0.2004.0 -> 0.2006.0 libnet-dns-perl: upgrade 1.24 -> 1.25 python3-blinker: Enable ptest python3-cbor2: Enable ptest python3-click: Enable ptest python3-u-msgpack-python: Enable ptest fuse3: Enable ptest sshfs-fuse: Enable ptest python3-wcwidth: Enable ptest Zheng Ruoqin (7): Fix build error when enable multilib. tracker: Fix build error when enable multilib. mraa: Disable python2, otherwise, there is a build error when enable multilib. paho-mqtt-c: Fix build error when enable multilib. upm:Fix build error when enable multilib. python3-unidiff: Enable ptest python3-uritemplate: Enable ptest Signed-off-by: Andrew Geissler Change-Id: I26a4e709d5f1416e73ec42e6dfc0e702dd1079bb --- .../meta-oe/recipes-support/ccid/ccid_1.4.32.bb | 20 --- .../meta-oe/recipes-support/ccid/ccid_1.4.33.bb | 20 +++ .../meta-oe/recipes-support/libiio/libiio_git.bb | 4 +- .../multipath-tools/multipath-tools_0.8.4.bb | 1 + .../meta-oe/recipes-support/nspr/nspr_4.25.bb | 197 --------------------- .../meta-oe/recipes-support/nspr/nspr_4.26.bb | 197 +++++++++++++++++++++ .../recipes-support/openldap/openldap_2.4.50.bb | 4 +- .../meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb | 21 --- .../meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb | 21 +++ 9 files changed, 243 insertions(+), 242 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.32.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.25.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb (limited to 'meta-openembedded/meta-oe/recipes-support') diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.32.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.32.bb deleted file mode 100644 index 394d0e887e..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.32.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Generic USB CCID smart card reader driver" -HOMEPAGE = "https://ccid.apdu.fr/" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = "virtual/libusb0 pcsc-lite" -RDEPENDS_${PN} = "pcsc-lite" - -SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ - file://no-dep-on-libfl.patch \ - file://0001-Add-build-rule-for-README.patch \ -" - -SRC_URI[md5sum] = "c4c70e928455f6ac3c4d02c4d2a654e9" -SRC_URI[sha256sum] = "545f4ab7887d512aa4b6967b80ef18a77b790c34769718452737a633cefc1639" - -inherit autotools pkgconfig - -FILES_${PN} += "${libdir}/pcsc/" -FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb new file mode 100644 index 0000000000..3c58894253 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb @@ -0,0 +1,20 @@ +SUMMARY = "Generic USB CCID smart card reader driver" +HOMEPAGE = "https://ccid.apdu.fr/" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "virtual/libusb0 pcsc-lite" +RDEPENDS_${PN} = "pcsc-lite" + +SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ + file://no-dep-on-libfl.patch \ + file://0001-Add-build-rule-for-README.patch \ +" + +SRC_URI[md5sum] = "b11907894ce2d345439635e2b967e7e5" +SRC_URI[sha256sum] = "5256da939711deb42b74d05d2bd6bd0c73c4d564feb0c1a50212609eb680e424" + +inherit autotools pkgconfig + +FILES_${PN} += "${libdir}/pcsc/" +FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index d12fac633f..b308bde171 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -4,8 +4,8 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -SRCREV = "26c5be5ae37334abf3021b52d27f84aa6a6b1842" -PV = "0.20+git${SRCPV}" +SRCREV = "565bf68eccfdbbf22cf5cb6d792e23de564665c7" +PV = "0.21+git${SRCPV}" SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index 0d03191373..48a348d801 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -117,3 +117,4 @@ FILES_kpartx = "${base_sbindir}/kpartx \ " RDEPENDS_${PN} += "kpartx" +PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.25.bb b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.25.bb deleted file mode 100644 index 1de26e1eed..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.25.bb +++ /dev/null @@ -1,197 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ - file://0002-Add-nios2-support.patch \ - file://0001-md-Fix-build-with-musl.patch \ - file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ - file://nspr.pc.in \ -" - -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" - -UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" - -SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" -SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" - -CVE_PRODUCT = "netscape_portable_runtime" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = " \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# Do not install nspr in usr/include, but in usr/include/nspr, the -# preferred path upstream. -EXTRA_OECONF += "--includedir=${includedir}/nspr" - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc - sed -i \ - -e 's:NSPRVERSION:${PV}:g' \ - -e 's:OEPREFIX:${prefix}:g' \ - -e 's:OELIBDIR:${libdir}:g' \ - -e 's:OEINCDIR:${includedir}:g' \ - -e 's:OEEXECPREFIX:${exec_prefix}:g' \ - ${D}${libdir}/pkgconfig/nspr.pc - - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests - cd ${B}/pr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb new file mode 100644 index 0000000000..a15afd667b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb @@ -0,0 +1,197 @@ +SUMMARY = "Netscape Portable Runtime Library" +HOMEPAGE = "http://www.mozilla.org/projects/nspr/" +LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" +LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ + file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" +SECTION = "libs/network" + +SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ + file://remove-rpath-from-tests.patch \ + file://fix-build-on-x86_64.patch \ + file://remove-srcdir-from-configure-in.patch \ + file://0002-Add-nios2-support.patch \ + file://0001-md-Fix-build-with-musl.patch \ + file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ + file://nspr.pc.in \ +" + +CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ + -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ + -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ + -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" + +UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" +UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" + +SRC_URI[md5sum] = "615695d57eaafa1fca085d3891befd68" +SRC_URI[sha256sum] = "fc9d142d85b74ffd2e6374a0c9016f3f2dac074225e24df3070e5a72d31b773d" + +CVE_PRODUCT = "netscape_portable_runtime" + +S = "${WORKDIR}/nspr-${PV}/nspr" + +RDEPENDS_${PN}-dev += "perl" +TARGET_CC_ARCH += "${LDFLAGS}" + +TESTS = " \ + accept \ + acceptread \ + acceptreademu \ + affinity \ + alarm \ + anonfm \ + atomic \ + attach \ + bigfile \ + cleanup \ + cltsrv \ + concur \ + cvar \ + cvar2 \ + dlltest \ + dtoa \ + errcodes \ + exit \ + fdcach \ + fileio \ + foreign \ + formattm \ + fsync \ + gethost \ + getproto \ + i2l \ + initclk \ + inrval \ + instrumt \ + intrio \ + intrupt \ + io_timeout \ + ioconthr \ + join \ + joinkk \ + joinku \ + joinuk \ + joinuu \ + layer \ + lazyinit \ + libfilename \ + lltest \ + lock \ + lockfile \ + logfile \ + logger \ + many_cv \ + multiwait \ + nameshm1 \ + nblayer \ + nonblock \ + ntioto \ + ntoh \ + op_2long \ + op_excl \ + op_filnf \ + op_filok \ + op_nofil \ + parent \ + parsetm \ + peek \ + perf \ + pipeping \ + pipeping2 \ + pipeself \ + poll_nm \ + poll_to \ + pollable \ + prftest \ + primblok \ + provider \ + prpollml \ + ranfile \ + randseed \ + reinit \ + rwlocktest \ + sel_spd \ + selct_er \ + selct_nm \ + selct_to \ + selintr \ + sema \ + semaerr \ + semaping \ + sendzlf \ + server_test \ + servr_kk \ + servr_uk \ + servr_ku \ + servr_uu \ + short_thread \ + sigpipe \ + socket \ + sockopt \ + sockping \ + sprintf \ + stack \ + stdio \ + str2addr \ + strod \ + switch \ + system \ + testbit \ + testfile \ + threads \ + timemac \ + timetest \ + tpd \ + udpsrv \ + vercheck \ + version \ + writev \ + xnotify \ + zerolen" + +inherit autotools multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +# Do not install nspr in usr/include, but in usr/include/nspr, the +# preferred path upstream. +EXTRA_OECONF += "--includedir=${includedir}/nspr" + +do_compile_prepend() { + oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export +} + +do_compile_append() { + oe_runmake -C pr/tests +} + +do_install_append() { + install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc + sed -i \ + -e 's:NSPRVERSION:${PV}:g' \ + -e 's:OEPREFIX:${prefix}:g' \ + -e 's:OELIBDIR:${libdir}:g' \ + -e 's:OEINCDIR:${includedir}:g' \ + -e 's:OEEXECPREFIX:${exec_prefix}:g' \ + ${D}${libdir}/pkgconfig/nspr.pc + + mkdir -p ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests + cd ${B}/pr/tests + install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests + + # delete compile-et.pl and perr.properties from ${bindir} because these are + # only used to generate prerr.c and prerr.h files from prerr.et at compile + # time + rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties +} + +FILES_${PN} = "${libdir}/lib*.so" +FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ + ${includedir}/* ${datadir}/aclocal/* " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb index b62b13a443..3a130f970c 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb @@ -172,9 +172,9 @@ FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \ ${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \ ${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*" -FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp ${localstatedir}/run ${localstatedir}/volatile/run" +FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp" FILES_${PN}-bin = "${bindir}" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" FILES_${PN}-dbg += "${libexecdir}/openldap/.debug" do_install_append() { diff --git a/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb b/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb deleted file mode 100644 index 865adc5a1b..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Extremely fast non-cryptographic hash algorithm" -DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ -working at speeds close to RAM limits." -HOMEPAGE = "http://www.xxhash.com/" -LICENSE = "BSD-2-Clause & GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=01a7eba4212ef1e882777a38585e7a9b" - -SRC_URI = "git://github.com/Cyan4973/xxHash.git" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" - -SRCREV = "d408e9b0606d07b1ddc5452ffc0ec8512211b174" - -S = "${WORKDIR}/git" - -do_compile () { - oe_runmake all -} - -do_install () { - oe_runmake DESTDIR=${D} install -} diff --git a/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb b/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb new file mode 100644 index 0000000000..6e74e49bf0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "Extremely fast non-cryptographic hash algorithm" +DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ +working at speeds close to RAM limits." +HOMEPAGE = "http://www.xxhash.com/" +LICENSE = "BSD-2-Clause & GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b335320506abb0505437e39295e799cb" + +SRC_URI = "git://github.com/Cyan4973/xxHash.git" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +SRCREV = "173e50be0509c6fb6c1bb74d95049ef61d7fdced" + +S = "${WORKDIR}/git" + +do_compile () { + oe_runmake all +} + +do_install () { + oe_runmake DESTDIR=${D} install +} -- cgit v1.2.3