Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev

8 files changed, 45 insertions, 25 deletions

diff --git a/recipes/binutils/binutils-cross_2.18.atmel.1.0.1.bb b/recipes/binutils/binutils-cross_2.18.atmel.1.0.1.bb
new file mode 100644
index 0000000000..fa82a3c433
--- /dev/null
+++ b/recipes/binutils/binutils-cross_2.18.atmel.1.0.1.bb
@@ -0,0 +1,3 @@
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-2.18"
+require binutils_${PV}.bb
+require binutils-cross.inc
diff --git a/recipes/binutils/binutils_2.18.atmel.1.0.1.bb b/recipes/binutils/binutils_2.18.atmel.1.0.1.bb
new file mode 100644
index 0000000000..d08e61cfbb
--- /dev/null
+++ b/recipes/binutils/binutils_2.18.atmel.1.0.1.bb
@@ -0,0 +1,23 @@
+INC_PR = "r8"
+PR = "${INC_PR}.2"
+
+require binutils.inc
+LICENSE = "GPLv3"
+
+SRC_URI = "\
+     http://avr32linux.org/twiki/pub/Main/BinutilsPatches/binutils-${PV}.tar.bz2;name=archive \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
+     file://binutils-configure-texinfo-version.patch;patch=1 \
+     file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
+     file://110-arm-eabi-conf.patch;patch=1 \
+     file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
+     file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
+     file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
+     file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
+     file://binutils-x86_64_i386_biarch.patch;patch=1 \
+     file://binutils-section-in-segment.patch;patch=1;pnum=0 \
+     file://parse-neon-vmov.diff;patch=1 \
+     "
+SRC_URI[archive.md5sum] = "71fb723a456fd902ee785328f0d09cd5"
+SRC_URI[archive.sha256sum] = "ea614e9fbec6cb9af08a911660a30991918df44e0328046341f7866ffd2f68d8"
+
diff --git a/recipes/libjson/libjson_0.6.bb b/recipes/libjson/libjson_0.6.bb
index aefeed3342..edc4fdceda 100644
--- a/recipes/libjson/libjson_0.6.bb
+++ b/recipes/libjson/libjson_0.6.bb
@@ -3,16 +3,12 @@ HOMEPAGE = "http://oss.metaparadigm.com/json-c/"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "BSD"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz"
 S = "${WORKDIR}/json-c-${PV}"
 
 inherit autotools 
 
-do_stage() {
-	autotools_stage_all
-}
-
 SRC_URI[md5sum] = "2d8b899aeeebbbe68158d25adf8a4f1e"
 SRC_URI[sha256sum] = "915ee6c4b8f1ffd5313d990875cd44e5e7092a51de259707daca797fd5c42b46"
diff --git a/recipes/libjson/libjson_0.9.bb b/recipes/libjson/libjson_0.9.bb
new file mode 100644
index 0000000000..2afc923039
--- /dev/null
+++ b/recipes/libjson/libjson_0.9.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "json C library"
+HOMEPAGE = "http://oss.metaparadigm.com/json-c/"
+AUTHOR = "Michael Clark and C. Watford"
+LICENSE = "MIT/X11"
+SECTION = "libs"
+
+SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz"
+S = "${WORKDIR}/json-c-${PV}"
+
+SRC_URI[md5sum] = "3a13d264528dcbaf3931b0cede24abae"
+SRC_URI[sha256sum] = "702a486c9bf8e19137d484ab5c49b4ad314eb5e1fe37062a72c0a0fa39439475"
+
+inherit autotools
diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc
index 982a5326fc..e0205890cd 100644
--- a/recipes/linux/linux.inc
+++ b/recipes/linux/linux.inc
@@ -191,10 +191,6 @@ do_configure_prepend() {
 		yes '' | oe_runmake oldconfig
 }
 
-do_configure_append_avr32() {
-        sed -i -e s:-mno-pic::g arch/avr32/Makefile
-}
-
 do_configure_append() {
         if test -e scripts/Makefile.fwinst ; then
 		sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst
diff --git a/recipes/llvm/llvm2.7/link.patch b/recipes/llvm/llvm2.7/link.patch
deleted file mode 100644
index 059bd92295..0000000000
--- a/recipes/llvm/llvm2.7/link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: llvm-2.7/tools/llvm-shlib/Makefile
-===================================================================
---- llvm-2.7/tools/llvm-shlib/Makefile (revision 103711)
-+++ llvm-2.7/tools/llvm-shlib/Makefile (working copy)
-@@ -56,5 +56,5 @@
-     LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) 
-                        -Wl,--no-whole-archive
-     # Don't allow unresolved symbols.
--    LLVMLibsOptions += -Wl,--no-undefined
-+    LLVMLibsOptions += -lgcc -Wl,--no-undefined
- endif
-
diff --git a/recipes/llvm/llvm2.7_2.7.bb b/recipes/llvm/llvm2.7_2.7.bb
index 623f6fa4b8..67633e22b4 100644
--- a/recipes/llvm/llvm2.7_2.7.bb
+++ b/recipes/llvm/llvm2.7_2.7.bb
@@ -1,20 +1,19 @@
 require llvm.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "llvm-common llvm2.7-native"
 
 SRC_URI = "\
   http://llvm.org/releases/${PV}/llvm-${PV}.tgz \
   file://BX_to_BLX.patch \
-  file://link.patch \
   "
 
 EXTRA_OECMAKE += "\
         -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \
         -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \
-		-DBUILD_SHARED_LIBS:BOOL=ON \
         -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+		-DBUILD_SHARED_LIBS:BOOL=ON \
 	"
 
 LLVM_RELEASE = "2.7"
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 0eb805b388..6f3e63e8c9 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -9,7 +9,7 @@ RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${P
 RSUGGESTS_${PN} = "flite espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool"
 
 PE = "1"
-INC_PR = "r7"
+INC_PR = "r8"
 
 inherit autotools
 
@@ -72,6 +72,8 @@ FILES_${PN}-graphics-gtk = " ${libdir}/${PN}/graphics/libgraphics_gtk_drawing_ar
 do_configure_prepend() {
   #Remove xpm building, replaced by icons in own package
   sed -i 's/\(.*SUBDIRS.*\) xpm\( \|$\)\(.*\)/\1\2\3/g' ${S}/navit/Makefile.am
+  # MOC=`$PKG_CONFIG QtGui --variable=moc_location` returns only /usr/bin/moc4 which is not available on hosts without Qt
+  sed -i "s#MOC=#MOC=${STAGING_DIR_NATIVE}#g" ${S}/configure.in
 }
 
 do_install_append() {