Merge branch 'next'

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

diff --cc Makefile
Simple merge

diff --cc package/Makefile.in
Simple merge

diff --cc package/boost/boost.mk
index d91baf117505da35660677fd09a3bddd89671a01,efc0020fe2dca8b9d8f76af9ce1a5eb12073e456..178f7b87387b063340fbc1a8975ddbb52d7351c8
--- 1/package/boost/boost.mk
--- 2/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@@ -89,10 -89,10 +89,14 @@@ BOOST_OPTS += toolset=gcc 
             abi=$(BOOST_ABI) \
             variant=$(if $(BR2_ENABLE_DEBUG),debug,release)
  
 +ifeq ($(BR2_sparc64),y)
 +BOOST_OPTS += architecture=sparc instruction-set=ultrasparc
 +endif
 +
+ ifeq ($(BR2_sparc),y)
+ BOOST_OPTS += architecture=sparc instruction-set=v8
+ endif
+ 
  # By default, Boost build and installs both the shared and static
  # variants. Override that if we want static only or shared only.
  ifeq ($(BR2_STATIC_LIBS),y)

diff --cc package/gcc/gcc-final/gcc-final.mk
Simple merge

diff --cc package/gmp/gmp.mk
Simple merge

diff --cc package/gpsd/gpsd.mk
Simple merge

diff --cc package/libglib2/libglib2.mk
Simple merge

diff --cc package/skeleton/skeleton.mk
Simple merge