From: Peter Korsgaard <peter@korsgaard.com>
Date: Thu, 1 Jun 2017 20:28:14 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=11271540bfe6adafbc133caf6b5b902a816f5f02;p=buildroot.git

Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

11271540bfe6adafbc133caf6b5b902a816f5f02
diff --cc package/c-icap/c-icap.mk
index 7925f5bc3e,e57ecd0ae0..c722098c59
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@@ -36,12 -34,40 +34,40 @@@ C_ICAP_CONF_OPTS += --without-bd
  endif
  
  ifeq ($(BR2_PACKAGE_BZIP2),y)
 -C_ICAP_CONF_OPTS += --with-bzip2
 +C_ICAP_CONF_OPTS += --with-bzlib
  C_ICAP_DEPENDENCIES += bzip2
  else
 -C_ICAP_CONF_OPTS += --without-bzip2
 +C_ICAP_CONF_OPTS += --without-bzlib
  endif
  
+ ifeq ($(BR2_PACKAGE_LIBMEMCACHED),y)
+ C_ICAP_CONF_OPTS += --with-memcached
+ C_ICAP_DEPENDENCIES += libmemcached
+ else
+ C_ICAP_CONF_OPTS += --without-memcached
+ endif
+ 
+ ifeq ($(BR2_PACKAGE_OPENLDAP),y)
+ C_ICAP_CONF_OPTS += --with-ldap
+ C_ICAP_DEPENDENCIES += openldap
+ else
+ C_ICAP_CONF_OPTS += --without-ldap
+ endif
+ 
+ ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ C_ICAP_CONF_OPTS += --with-openssl
+ C_ICAP_DEPENDENCIES += openssl
+ else
+ C_ICAP_CONF_OPTS += --without-openssl
+ endif
+ 
+ ifeq ($(BR2_PACKAGE_PCRE),y)
+ C_ICAP_CONF_OPTS += --with-pcre
+ C_ICAP_DEPENDENCIES += pcre
+ else
+ C_ICAP_CONF_OPTS += --without-pcre
+ endif
+ 
  ifeq ($(BR2_PACKAGE_ZLIB),y)
  C_ICAP_CONF_OPTS += --with-zlib
  C_ICAP_DEPENDENCIES += zlib
diff --cc package/gcc/Config.in.host
index 5a0fd970b8,3e7fb807f9..2b78b29d4a
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@@ -105,8 -91,8 +91,8 @@@ config BR2_GCC_VERSIO
  	default "4.9.4"     if BR2_GCC_VERSION_4_9_X
  	default "5.4.0"     if BR2_GCC_VERSION_5_X
  	default "6.3.0"     if BR2_GCC_VERSION_6_X
+ 	default "7.1.0"     if BR2_GCC_VERSION_7_X
 -	default "arc-2017.03-rc1" if BR2_GCC_VERSION_ARC
 +	default "arc-2017.03" if BR2_GCC_VERSION_ARC
  	default "musl-5.4.0" if BR2_GCC_VERSION_OR1K
  
  config BR2_EXTRA_GCC_CONFIG_OPTIONS
diff --cc package/gcc/gcc.hash
index db59bae309,7a37bb6da1..f64329b072
--- a/package/gcc/gcc.hash
+++ b/package/gcc/gcc.hash
@@@ -10,8 -4,10 +4,10 @@@ sha512  93abb78e16277454f41a8e9810f41f6
  sha512  2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b  gcc-5.4.0.tar.bz2
  # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.3.0/sha512.sum
  sha512  234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78  gcc-6.3.0.tar.bz2
+ # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.1.0/sha512.sum
+ sha512  b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec  gcc-7.1.0.tar.bz2
  
  # Locally calculated (fetched from Github)
 -sha512  e4fe5a179b8feabf932a8a6f4794ff6907b868a65487412d855a4b3671aa24ec8544a44f3b63e69ea2c12fcd4d8028d0619d40bf016ee7c1a5b5a99aa9315ef3  gcc-arc-2017.03-rc1.tar.gz
 +sha512  282f76b8b63372f5b4426092b80d36da96cd0bda2a8588405b9ec22806c69fafb696b0e0df65bc36c3c3aa8ce5befc24246fd5c6ddb21dcde01f45f7b11ff7c4  gcc-arc-2017.03.tar.gz
  # Locally calculated (fetched from Github)
  sha512  841101f7de45f327bf2e92f3efc73ca88a021e4b9b541458ce80a16e55882bd8606a8492d75c57c589ee2c10d42ae2865b67690155d7289a541df1d68096402f  gcc-musl-5.4.0.tar.gz
diff --cc package/mosh/Config.in
index 18065201bc,96c3b94e8c..da8a305a06
--- a/package/mosh/Config.in
+++ b/package/mosh/Config.in
@@@ -20,15 -20,8 +20,16 @@@ config BR2_PACKAGE_MOS
  	# runtime dependency
  	select BR2_PACKAGE_OPENSSH if !BR2_PACKAGE_DROPBEAR_CLIENT
  	help
--	  Remote terminal application that supports intermittent connectivity,
--	  allows roaming, and provides speculative local echo and line editing
--	  of user keystrokes.
++	  Remote terminal application that supports intermittent
++	  connectivity, allows roaming, and provides speculative local
++	  echo and line editing of user keystrokes.
 +
- 	  Mosh requires that the remote machine has a locale setting matching
- 	  the one on the client.
++	  Mosh requires that the remote machine has a locale setting
++	  matching the one on the client.
 +
- 	  When using mosh with dropbear on a remote machine, the client needs mosh
- 	  with a version above 1.3.0 and the --no-ssh-pty option needs to be passed
- 	  when starting the connection.
++	  When using mosh with dropbear on a remote machine, the
++	  client needs mosh with a version above 1.3.0 and the
++	  --no-ssh-pty option needs to be passed when starting the
++	  connection.
  
- 	  https://mosh.mit.edu
+ 	  https://mosh.org