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

11 files changed, 52 insertions, 39 deletions

diff --git a/recipes/glibc/glibc-2.9/etc/ld.so.conf b/recipes/glibc/glibc-2.9/etc/ld.so.conf
new file mode 100644
index 0000000000..46e06d3f0a
--- /dev/null
+++ b/recipes/glibc/glibc-2.9/etc/ld.so.conf
@@ -0,0 +1,2 @@
+/usr/local/lib
+
diff --git a/recipes/icedtea/icedtea6-native-1.7.3/icedtea-oe-path.patch b/recipes/icedtea/icedtea6-native-1.7.3/icedtea-oe-path.patch
deleted file mode 100644
index ad25472851..0000000000
--- a/recipes/icedtea/icedtea6-native-1.7.3/icedtea-oe-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openjdk/jdk/make/common/shared/Defs-utils.gmk
-===================================================================
---- openjdk/jdk/make/common/shared/Defs-utils.gmk	2010-07-15 18:22:59.731376457 +0200
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2010-07-15 18:24:09.784285551 +0200
-@@ -146,7 +146,7 @@
- WC             = $(UTILS_USR_BIN_PATH)wc
- WHICH          = $(UTILS_USR_BIN_PATH)which
- YACC           = $(UTILS_CCS_BIN_PATH)yacc
--ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
-+ZIPEXE         = $(STAGING_BINDIR_NATIVE)zip
- 
- # Special cases
- #RM   is defined by GNU Make as 'rm -f'
diff --git a/recipes/icedtea/icedtea6-native-1.8/icedtea-oe-path.patch b/recipes/icedtea/icedtea6-native-1.8/icedtea-oe-path.patch
deleted file mode 100644
index ad25472851..0000000000
--- a/recipes/icedtea/icedtea6-native-1.8/icedtea-oe-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openjdk/jdk/make/common/shared/Defs-utils.gmk
-===================================================================
---- openjdk/jdk/make/common/shared/Defs-utils.gmk	2010-07-15 18:22:59.731376457 +0200
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2010-07-15 18:24:09.784285551 +0200
-@@ -146,7 +146,7 @@
- WC             = $(UTILS_USR_BIN_PATH)wc
- WHICH          = $(UTILS_USR_BIN_PATH)which
- YACC           = $(UTILS_CCS_BIN_PATH)yacc
--ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
-+ZIPEXE         = $(STAGING_BINDIR_NATIVE)zip
- 
- # Special cases
- #RM   is defined by GNU Make as 'rm -f'
diff --git a/recipes/icedtea/icedtea6-native.inc b/recipes/icedtea/icedtea6-native.inc
index 4ee792adb7..53fb43f9bd 100644
--- a/recipes/icedtea/icedtea6-native.inc
+++ b/recipes/icedtea/icedtea6-native.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools"
 HOMEPAGE = "http://icedtea.classpath.org"
 LICENSE  = "GPL with Classpath Exception"
-INC_PR = "r1"
+INC_PR = "r2"
 
 DEPENDS = "virtual/javac-native classpath-tools-native \
 	   virtual/java-native classpath-native \
@@ -105,7 +105,7 @@ do_configure_append() {
 }
 
 EXTRA_OEMAKE = ' \
-                STAGING_BINDIR_NATIVE="${STAGING_BINDIR_NATIVE}/" \
+                ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \
                '
 
 do_compile() {
diff --git a/recipes/icedtea/icedtea6-native_1.7.3.bb b/recipes/icedtea/icedtea6-native_1.7.3.bb
index 16575a4380..9ac7aa6e5b 100644
--- a/recipes/icedtea/icedtea6-native_1.7.3.bb
+++ b/recipes/icedtea/icedtea6-native_1.7.3.bb
@@ -24,7 +24,6 @@ ICEDTEA_PATCHES = "\
 	file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \
 	file://icedtea-jdk-sane-x86-arch.patch;apply=no \
 	file://icedtea-unbreak-float.patch;apply=no \
-        file://icedtea-oe-path.patch;apply=no \
 	"
 
 export DISTRIBUTION_PATCHES = "\
@@ -34,5 +33,4 @@ export DISTRIBUTION_PATCHES = "\
 	patches/icedtea-hotspot-make-arch-sane-for-x86.patch \
 	patches/icedtea-jdk-sane-x86-arch.patch \
 	patches/icedtea-unbreak-float.patch \
-        patches/icedtea-oe-path.patch \
 	"
diff --git a/recipes/icedtea/icedtea6-native_1.8.bb b/recipes/icedtea/icedtea6-native_1.8.bb
index 61cf6e673b..67c26321ce 100644
--- a/recipes/icedtea/icedtea6-native_1.8.bb
+++ b/recipes/icedtea/icedtea6-native_1.8.bb
@@ -42,7 +42,6 @@ ICEDTEA_PATCHES = "\
         file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \
         file://icedtea-jdk-sane-x86-arch.patch;apply=no \
         file://icedtea-unbreak-float.patch;apply=no \
-        file://icedtea-oe-path.patch;apply=no \
 	"
 
 export DISTRIBUTION_PATCHES = "\
@@ -52,7 +51,6 @@ export DISTRIBUTION_PATCHES = "\
 	patches/icedtea-hotspot-make-arch-sane-for-x86.patch \
         patches/icedtea-jdk-sane-x86-arch.patch \
 	patches/icedtea-unbreak-float.patch \
-        patches/icedtea-oe-path.patch \
 	"
 
 EXTRA_OECONF += " --with-jaxws-drop-zip=${DL_DIR}/jdk6-jaxws-2009_10_27.zip \
diff --git a/recipes/openjdk/openjdk-6-common.inc b/recipes/openjdk/openjdk-6-common.inc
index 9db2a7c433..8cbf8c39d5 100644
--- a/recipes/openjdk/openjdk-6-common.inc
+++ b/recipes/openjdk/openjdk-6-common.inc
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET"
 S = "${WORKDIR}/${ICEDTEA}"
 B = "${S}/build"
 
-INC_PR = "r6"
+INC_PR = "r7"
 
 SRC_URI = "\
   ${ICEDTEA_URI} \
@@ -35,6 +35,7 @@ DEPENDS = "giflib libpng jpeg cups \
 	   ant-native alsa-lib libffi \
 	   icedtea6-native fastjar \
            llvm2.7 cacaoh-openjdk-native \
+           zip-native \
 	 "
 
 # The OpenJDK build with interpreter optimizations for ARM depends on a binary
@@ -223,6 +224,7 @@ EXTRA_OEMAKE += ' \
                 OE_CPPFLAGS="${TARGET_CPPFLAGS}" \
                 OE_CXXFLAGS="${TARGET_CXXFLAGS}" \
                 OE_LDFLAGS="${TARGET_LDFLAGS}" \
+                ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \
                '
 
 # Puts an OE specific string into the binary making it possible for the user
diff --git a/recipes/quilt/quilt-0.48/fix_new_GNU_patch_detection.patch b/recipes/quilt/quilt-0.48/fix_new_GNU_patch_detection.patch
new file mode 100644
index 0000000000..f790f76f66
--- /dev/null
+++ b/recipes/quilt/quilt-0.48/fix_new_GNU_patch_detection.patch
@@ -0,0 +1,36 @@
+# origin: http://git.savannah.gnu.org/cgit/quilt.git/commit/?id=38df0b210c3df67f3e784af92232ae1946b98ecd
+# Properly detect newer versions of GNU patch
+# New versions of GNU patch present themselves as "GNU patch" instead of just "patch".
+
+diff --git a/configure.ac b/configure.ac
+index 9d4a62e..cc850fa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -262,7 +262,11 @@ fi
+ AC_MSG_CHECKING([the version of $PATCH])
+ if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
+   set -- `$PATCH --version 2> /dev/null`
+-  patch_version=$2
++  if test x$1 = xGNU ; then
++    patch_version=$3
++  else
++    patch_version=$2
++  fi
+   AC_MSG_RESULT($patch_version)
+   saved_IFS=$IFS; IFS='.'
+   set -- $patch_version
+--- a/configure
++++ b/configure
+@@ -5896,7 +5896,11 @@
+ echo $ECHO_N "checking the version of $PATCH... $ECHO_C" >&6; }
+ if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
+   set -- `$PATCH --version 2> /dev/null`
+-  patch_version=$2
++  if test x$1 = xGNU ; then
++    patch_version=$3
++  else
++    patch_version=$2
++  fi
+   { echo "$as_me:$LINENO: result: $patch_version" >&5
+ echo "${ECHO_T}$patch_version" >&6; }
+   saved_IFS=$IFS; IFS='.'
diff --git a/recipes/quilt/quilt-native_0.48.bb b/recipes/quilt/quilt-native_0.48.bb
index e3e6cda23b..5b4449b2ac 100644
--- a/recipes/quilt/quilt-native_0.48.bb
+++ b/recipes/quilt/quilt-native_0.48.bb
@@ -1,6 +1,8 @@
 require quilt-native.inc
 
-PR="r2"
+PR="r3"
+
+SRC_URI_append = "file://fix_new_GNU_patch_detection.patch"
 
 SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
 SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
diff --git a/recipes/vala/vala_0.9.3.1.bb b/recipes/vala/vala_0.9.3.1.bb
deleted file mode 100644
index 0005dc22f2..0000000000
--- a/recipes/vala/vala_0.9.3.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require vala.inc
-PR = "${INC_PR}.0"
-
-SRC_URI[archive.md5sum] = "4ebf3a224cdbd3e73bc1786bcbf5bead"
-SRC_URI[archive.sha256sum] = "9448861683f596b0ab5938baa1e6b19b535fe78d73a3fe043e57cee8d79dc2f6"
diff --git a/recipes/vala/vala_0.9.3.2.bb b/recipes/vala/vala_0.9.3.2.bb
new file mode 100644
index 0000000000..8a78768255
--- /dev/null
+++ b/recipes/vala/vala_0.9.3.2.bb
@@ -0,0 +1,6 @@
+require vala.inc
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "aee9ec6a9eab9b4a5412081a9efa25e1"
+SRC_URI[archive.sha256sum] = "52421f6c4a8aa24b71c6730ee9f3cdfd536a61c9afebf939eb930254de208770"
+