Merge pull request #32 from kraj/master

Forward port dbus-java recipes and some more openjdk-7 fixes

3 files changed, 21 insertions, 1 deletions

diff --git a/recipes-core/classpath/classpath-0.99/use_libdir.patch b/recipes-core/classpath/classpath-0.99/use_libdir.patch
new file mode 100644
index 0000000..3b4df90
--- /dev/null
+++ b/recipes-core/classpath/classpath-0.99/use_libdir.patch
@@ -0,0 +1,19 @@
+on some arches we use lib64 for libdir so hardcoding to lib
+is not gonna work always
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: classpath-0.99/resource/Makefile.am
+===================================================================
+--- classpath-0.99.orig/resource/Makefile.am    2006-01-12 12:15:43.000000000 -0800
++++ classpath-0.99/resource/Makefile.am 2012-11-21 14:28:02.433005139 -0800
+@@ -1,7 +1,7 @@
+ ## used by automake to generate Makefile.in
+ 
+ logging_DATA = java/util/logging/logging.properties
+-loggingdir = $(prefix)/lib
++loggingdir = $(libdir)
+ 
+ security_DATA = java/security/classpath.security
+-securitydir = $(prefix)/lib/security
++securitydir = $(libdir)/security
diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc
index 1a8093e..214c9cd 100644
--- a/recipes-core/classpath/classpath.inc
+++ b/recipes-core/classpath/classpath.inc
@@ -21,7 +21,7 @@ RPROVIDES_${PN} = "${PBN}"
 RPROVIDES_${PN}-common = "${PBN}-common"
 RPROVIDES_${PN}-gtk = "${PBN}-awt"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
 
diff --git a/recipes-core/classpath/classpath_0.99.bb b/recipes-core/classpath/classpath_0.99.bb
index ee38992..7839519 100644
--- a/recipes-core/classpath/classpath_0.99.bb
+++ b/recipes-core/classpath/classpath_0.99.bb
@@ -8,6 +8,7 @@ SRC_URI += " \
             file://autotools.patch \
             file://miscompilation.patch \
             file://toolwrapper-exithook.patch \
+            file://use_libdir.patch \
            "
 
 SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4"