From 2eeb5257296f97a4a52f32580ebcfdc0d225c794 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 10 Sep 2018 18:40:16 +0000 Subject: meta-openembedded: refresh 2bb21ef27c..8760facba1 Update meta-openembedded to sumo HEAD. Armin Kuster (4): boinc: refresh patches postgresql: update to 9.4.20 sblim-sfc-common: use official SPDX license for EPL wireshark: 2.4.8 src moved to all-versions Gregory Vimont (1): tbb: check the version of the cross gcc instead of host gcc Leon Anavi (1): rygel: Update license to LGPLv2.1 Richard Purdie (1): xmlstarlet: Disable PARALLEL_MAKE (again) Change-Id: I3e00f68cb7c8c54c2457003d26da8992b1a953c3 Signed-off-by: Brad Bishop --- .../recipes-connectivity/rygel/rygel_0.34.0.bb | 2 +- .../recipes-support/wireshark/wireshark_2.4.8.bb | 2 +- ...0001-Use-pkg-config-for-libxml2-detection.patch | 8 +-- .../postgresql/files/not-check-libperl.patch | 10 ++-- .../recipes-dbs/postgresql/postgresql_9.4.17.bb | 14 ------ .../recipes-dbs/postgresql/postgresql_9.4.20.bb | 14 ++++++ .../boinc/boinc-client/boinc-AM_CONDITIONAL.patch | 12 +++-- .../sblim-sfc-common/sblim-sfc-common_1.0.1.bb | 2 +- .../meta-oe/recipes-support/tbb/tbb.bb | 1 + .../tbb/tbb/0002-linux-Fix-gcc-version-check.patch | 57 ++++++++++++++++++++++ .../recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb | 5 ++ 11 files changed, 96 insertions(+), 31 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.20.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/tbb/tbb/0002-linux-Fix-gcc-version-check.patch (limited to 'meta-openembedded') diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb index e94c9ff8d..f13f5cec0 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb @@ -5,7 +5,7 @@ Additionally, media player software may use Rygel to become a MediaRenderer \ that may be controlled remotely by a UPnP or DLNA Controller." HOMEPAGE = "http://live.gnome.org/Rygel" -LICENSE = "LGPL1.1+" +LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstreamer1.0-plugins-base ossp-uuid libgee libsoup-2.4 libmediaart-2.0 libunistring sqlite3 intltool-native" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.4.8.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.4.8.bb index 7c81ad3ee..51a7aa8cd 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.4.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.4.8.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error" -SRC_URI = "https://1.as.dl.wireshark.org/src/${BP}.tar.xz" +SRC_URI = "https://1.as.dl.wireshark.org/src/all-versions/${BP}.tar.xz" SRC_URI += "file://libgcrypt.patch" UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch index ce2a60cab..fafbc25a4 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch @@ -12,11 +12,11 @@ Signed-off-by: Philip Balister configure.in | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) -Index: postgresql-9.4.15/configure.in +Index: postgresql-9.4.20/configure.in =================================================================== ---- postgresql-9.4.15.orig/configure.in -+++ postgresql-9.4.15/configure.in -@@ -759,19 +759,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build w +--- postgresql-9.4.20.orig/configure.in ++++ postgresql-9.4.20/configure.in +@@ -789,19 +789,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build w [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) if test "$with_libxml" = yes ; then diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch index 971510943..c57b42135 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch @@ -13,16 +13,16 @@ Signed-off-by: Roy Li configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: postgresql-9.4.15/configure.in +Index: postgresql-9.4.20/configure.in =================================================================== ---- postgresql-9.4.15.orig/configure.in -+++ postgresql-9.4.15/configure.in -@@ -1879,7 +1879,7 @@ if test "$with_tcl" = yes; then +--- postgresql-9.4.20.orig/configure.in ++++ postgresql-9.4.20/configure.in +@@ -1931,7 +1931,7 @@ if test "$with_tcl" = yes; then fi # check for -if test "$with_perl" = yes; then +if test "$with_perl" = yes && test "$cross_compiling" = no; then ac_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$perl_archlibexp/CORE" + CPPFLAGS="$CPPFLAGS $perl_includespec" AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file is required for Perl])], diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb deleted file mode 100644 index 061184a6f..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb +++ /dev/null @@ -1,14 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=6dc95e63aa4d72502ff8193dfe2ddd38" - -SRC_URI += "\ - file://not-check-libperl.patch \ -" - -do_compile_prepend_libc-musl() { - sed -i -e 's/\-lnsl//g' ${B}/src/Makefile.global -} - -SRC_URI[md5sum] = "0a08f4078f5e4a54e764f63ad38a6de3" -SRC_URI[sha256sum] = "7a320cd335052b840d209dc9688f09965763351c590e3cc7bf577591179fd7c6" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.20.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.20.bb new file mode 100644 index 000000000..61f623e3d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.20.bb @@ -0,0 +1,14 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=6dc95e63aa4d72502ff8193dfe2ddd38" + +SRC_URI += "\ + file://not-check-libperl.patch \ +" + +do_compile_prepend_libc-musl() { + sed -i -e 's/\-lnsl//g' ${B}/src/Makefile.global +} + +SRC_URI[md5sum] = "5821867741c821736266f27b6b8a859a" +SRC_URI[sha256sum] = "eeb1d8ddb2854c9e4d8b5cbd65665260c0ae8cbcb911003f24c2d82ccb97f87f" diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch index 7becb94e6..ab8042f72 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch @@ -3,17 +3,19 @@ Add configure check for gtk2+ and objc++ Signed-off-by: Khem Raj Upstream-Status: Pending ---- A/configure.ac -+++ B/configure.ac -@@ -39,6 +39,7 @@ AC_PROG_CC - AC_PROG_CXX +Index: boinc-client_release-7.6-7.6.33/configure.ac +=================================================================== +--- boinc-client_release-7.6-7.6.33.orig/configure.ac ++++ boinc-client_release-7.6-7.6.33/configure.ac +@@ -64,6 +64,7 @@ m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCX + dnl ------ AC_PROG_F77 AC_PROG_CPP +AC_PROG_OBJCXX AC_PROG_MAKE_SET SAH_LINKS AC_LANG_PUSH(C) -@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test " +@@ -1081,6 +1082,8 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb index 2a9b4bb88..4e90215c0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "\ This package provides a common library for functions shared between Small Footprint CIM Broker (sblim-sfcb) \ Small Footprint CIM Client (and sblim-sfcc)." HOMEPAGE = "http://sourceforge.net/projects/sblim/" -LICENSE = "EPL" +LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" SECTION = "Development/Libraries" diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb.bb index bad9481f7..f87010401 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb.bb @@ -13,6 +13,7 @@ PV = "${PRDATE}+${SRCPV}" SRC_URI = "git://github.com/01org/tbb;branch=${BRANCH} \ file://cross-compile.patch \ file://0001-mallinfo-is-glibc-specific-API-mark-it-so.patch \ + file://0002-linux-Fix-gcc-version-check.patch \ file://tbb.pc \ " diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0002-linux-Fix-gcc-version-check.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0002-linux-Fix-gcc-version-check.patch new file mode 100644 index 000000000..9824b61e9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0002-linux-Fix-gcc-version-check.patch @@ -0,0 +1,57 @@ +From aee098f1bf0511c6b5544de3170a9e8b51673b60 Mon Sep 17 00:00:00 2001 +From: Pierre Le Magourou +Date: Tue, 23 Jan 2018 15:25:50 +0100 +Subject: [PATCH] linux.gcc: Fix cross compilation error. + +When cross compiling on linux with gcc, the host gcc was used instead of +the cross gcc to set compilation flags according to gcc version. + +When the cross gcc was in version 5.X and the host gcc in version 7.X, +tbb was compiled with the -flifetime-dse=1 flag that does not exist on +gcc 5.X. +--- + build/linux.gcc.inc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc +index 5c1889c..a4d6698 100644 +--- a/build/linux.gcc.inc ++++ b/build/linux.gcc.inc +@@ -41,29 +41,29 @@ LINK_FLAGS = -Wl,-rpath-link=. -rdynamic + C_FLAGS = $(CPLUS_FLAGS) + + # gcc 4.2 and higher support OpenMP +-ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[2-9]|[5-9])")) ++ifneq (,$(shell $(CC) -dumpversion | egrep "^(4\.[2-9]|[5-9])")) + OPENMP_FLAG = -fopenmp + endif + + # gcc 4.8 and later support RTM intrinsics, but require command line switch to enable them +-ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[8-9]|[5-9])")) ++ifneq (,$(shell $(CC) -dumpversion | egrep "^(4\.[8-9]|[5-9])")) + RTM_KEY = -mrtm + endif + + # gcc 4.0 and later have -Wextra that is used by some our customers. +-ifneq (,$(shell gcc -dumpversion | egrep "^([4-9])")) ++ifneq (,$(shell $(CC) -dumpversion | egrep "^([4-9])")) + TEST_WARNING_KEY += -Wextra + endif + + # gcc 5.0 and later have -Wsuggest-override option + # enable it via a pre-included header in order to limit to C++11 and above +-ifneq (,$(shell gcc -dumpversion | egrep "^([5-9])")) ++ifneq (,$(shell $(CC) -dumpversion | egrep "^([5-9])")) + INCLUDE_TEST_HEADERS = -include $(tbb_root)/src/test/harness_preload.h + endif + + # gcc 6.0 and later have -flifetime-dse option that controls + # elimination of stores done outside the object lifetime +-ifneq (,$(shell gcc -dumpversion | egrep "^([6-9])")) ++ifneq (,$(shell $(CC) -dumpversion | egrep "^([6-9])")) + # keep pre-contruction stores for zero initialization + DSE_KEY = -flifetime-dse=1 + endif +-- +2.15.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb index e3d52e616..e28fd61a0 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb @@ -24,3 +24,8 @@ inherit autotools EXTRA_OECONF="--disable-build-docs \ --with-libxml-prefix=${STAGING_LIBDIR}/.. \ --with-libxslt-prefix=${STAGING_LIBDIR}/.." + +# http://errors.yoctoproject.org/Errors/Details/157121/ +# /bin/bash: src/usage.c: No such file or directory +# Makefile:2121: recipe for target 'src/usage.c' failed +PARALLEL_MAKE = "" -- cgit v1.2.3