From 63ae87823ca5774411cb29a7aebf35efae85f0b3 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Wed, 9 Oct 2019 09:56:13 -0400
Subject: meta-openembedded: subtree update:01d539b324..fd1a0c9210

Adrian Bunk (1):
      xmlrpc-c: Remove the RDEPENDS on perl

Denys Dmytriyenko (1):
      mariadb: update SRC_URI to use archive.mariadb.org

Khem Raj (7):
      xorg-fonts-100dpi: Change License Custom -> MIT
      fio: Depend on coreutils-native for fmt utility
      fio: Fix build when march is armv7ve
      pmdk: Update to 1.7
      README: Document need for 32bit compiler
      mongodb: Turn system libpcre support into packageconfig
      grpc: Update to 1.24.1

Otavio Salvador (1):
      modemmanager: Upgrade 1.10.2 -> 1.10.6

Palmer Dabbelt (1):
      Add zeus compatibility to all layer.conf files

Peiran Hong (1):
      tcpdump: upgrade 4.9.2 -> 4.9.3

Stefan Agner (1):
      zram: properly implement systemd service

Stefan Wiehler (1):
      nvme-cli: upgrade 1.6 -> 1.9

Trevor Gamblin (2):
      gnome-desktop3: upgrade from 3.32.0 to 3.34.0
      freeradius: add -latomic for armv5

William A. Kennington III via Openembedded-devel (1):
      log4cpp: Stop using RC as a variable

Change-Id: I9b3bd69a061da11a59d38bce42543cb090b24601
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 6 +++---
 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'meta-openembedded/meta-oe/recipes-dbs')

diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
index e7e03a4e14..cd8ccdc8ab 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
+++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
@@ -3,7 +3,7 @@ LICENSE = "SSPL-1 & Apache-2.0 & Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE-Community.txt;md5=3a865f27f11f43ecbe542d9ea387dcf1 \
                     file://APACHE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-DEPENDS = "openssl libpcre libpcap zlib boost curl python3 \
+DEPENDS = "openssl libpcap zlib boost curl python3 \
            python3-setuptools-native \
            python3-pyyaml-native python3-cheetah-native \
            python3-psutil-native python3-regex-native \
@@ -38,7 +38,7 @@ S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST ?= '(x86_64|powerpc64|aarch64).*-linux'
 
-PACKAGECONFIG ??= "tcmalloc"
+PACKAGECONFIG ??= "tcmalloc system-pcre"
 # gperftools compilation fails for arm below v7 because of missing support of
 # dmb operation. So we use system-allocator instead of tcmalloc
 PACKAGECONFIG_remove_armv6 = "tcmalloc"
@@ -46,6 +46,7 @@ PACKAGECONFIG_remove_libc-musl = "tcmalloc"
 
 PACKAGECONFIG[tcmalloc] = "--use-system-tcmalloc,--allocator=system,gperftools,"
 PACKAGECONFIG[shell] = ",--js-engine=none,,"
+PACKAGECONFIG[system-pcre] = "--use-system-pcre,,libpcre,"
 
 EXTRA_OESCONS = "--prefix=${D}${prefix} \
                  LIBPATH=${STAGING_LIBDIR} \
@@ -54,7 +55,6 @@ EXTRA_OESCONS = "--prefix=${D}${prefix} \
                  TARGET_ARCH=${TARGET_ARCH} \
                  --ssl \
                  --disable-warnings-as-errors \
-                 --use-system-pcre \
                  --use-system-zlib \
                  --nostrip \
                  --endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
index 9ddf2bee5c..f1c71feebe 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b1becf0cfa3366e0f4d854d1d264f311"
 
-SRC_URI = "https://downloads.mariadb.com/MariaDB/${BPN}-${PV}/source/${BPN}-${PV}.tar.gz \
+SRC_URI = "http://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
            file://my.cnf \
            file://mysqld.service \
            file://install_db.service \
-- 
cgit v1.2.3