[oe-commits] org.oe.dev merge of '8c0681c145743970130cbe62da92b45f76b3c4b5'
koen commit
oe at amethyst.openembedded.net
Thu May 15 17:24:33 UTC 2008
merge of '8c0681c145743970130cbe62da92b45f76b3c4b5'
and 'b459044149ae9e0fc21221903548ff66c0427cef'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 3b5a264cff607e4c4977e318dde1e861a664ad81
ViewMTN: http://monotone.openembedded.org/revision/info/3b5a264cff607e4c4977e318dde1e861a664ad81
Files:
1
packages/dbus-java/dbus-java_2.3.bb
packages/libmatthew/libmatthew_0.5.bb
packages/gcc/gcc-4.2.2.inc
packages/gcc/gcc-4.3.0.inc
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc-cross_4.3.0.bb
packages/gcc/gcc-cross_csl-arm-2008q1.bb
packages/gcc/gcc-csl-arm-2008q1.inc
packages/gcc/gcc-package-cross.inc
Diffs:
#
# mt diff -r8c0681c145743970130cbe62da92b45f76b3c4b5 -r3b5a264cff607e4c4977e318dde1e861a664ad81
#
#
#
# patch "packages/dbus-java/dbus-java_2.3.bb"
# from [17764905d124799a8edd17b918d5840fb5165cb9]
# to [815714e636ac18cc91f38966a30a02df3057e1ef]
#
# patch "packages/libmatthew/libmatthew_0.5.bb"
# from [4d5017a96ee835a24017a6f101e47e55243c6816]
# to [accbbb844426aee0da50d5f0184b814a9b5f0354]
#
============================================================
--- packages/dbus-java/dbus-java_2.3.bb 17764905d124799a8edd17b918d5840fb5165cb9
+++ packages/dbus-java/dbus-java_2.3.bb 815714e636ac18cc91f38966a30a02df3057e1ef
@@ -4,10 +4,10 @@ SECTION = "libs"
LICENSE = "GPLv2 AFL"
SECTION = "libs"
-HOMEPAGE = "http://jalimo.org"
+HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
AUTHOR = "Matthew Johnson <dbus at matthew.ath.cx>"
-PR = "r2"
+PR = "r3"
inherit java-library
@@ -15,7 +15,7 @@ S = "${WORKDIR}/dbus-java-${PV}"
S = "${WORKDIR}/dbus-java-${PV}"
-DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native"
+DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
RSUGGESTS_libdbus-java = "libmatthew-java dbus"
RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}"
RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}"
@@ -25,8 +25,8 @@ do_compile () {
oe_runmake \
JCFLAGS="-source 1.5" \
JAVAC="javac" \
- JARPREFIX="${STAGING_DATADIR}/java" \
- JAVAUNIXJARDIR="${STAGING_DATADIR}/java" \
+ JARPREFIX="${STAGING_DATADIR_JAVA}" \
+ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
CLASSPATH="${S}/classes" \
JAR="fastjar" \
.binclasses
@@ -34,8 +34,8 @@ do_compile () {
oe_runmake \
JCFLAGS="-source 1.5" \
JAVAC="javac" \
- JARPREFIX="${STAGING_DATADIR}/java" \
- JAVAUNIXJARDIR="${STAGING_DATADIR}/java" \
+ JARPREFIX="${STAGING_DATADIR_JAVA}" \
+ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
CLASSPATH="${S}/classes" \
JAR="fastjar" \
all
@@ -47,8 +47,8 @@ do_compile () {
oe_runmake \
JAVAC="oefatal \"No Java compilation expected here.\"" \
JAR="oefatal \"No jar invocation expected here.\"" \
- JARPREFIX=${datadir}/java \
- JAVAUNIXPATH=${datadir}/java \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
all
# Trigger generation of all documentation files to prevent this
@@ -56,12 +56,12 @@ do_compile () {
oe_runmake \
JAVAC="oefatal \"No Java compilation expected here.\"" \
JAR="oefatal \"No jar invocation expected here.\"" \
- JARPREFIX=${datadir}/java \
- JAVAUNIXPATH=${datadir}/java \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
CreateInterface.1 ListDBus.1 DBusDaemon.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL DBusCall.1
}
-do_staging () {
+do_stage () {
oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
}
============================================================
--- packages/libmatthew/libmatthew_0.5.bb 4d5017a96ee835a24017a6f101e47e55243c6816
+++ packages/libmatthew/libmatthew_0.5.bb accbbb844426aee0da50d5f0184b814a9b5f0354
@@ -1,12 +1,14 @@ SECTION = "libs"
DESCRIPTION = "Unix socket, debug and hexdump libraries"
LICENSE = "LGPL"
SECTION = "libs"
-HOMEPAGE = "http://jalimo.org"
+HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
AUTHOR = "Matthew Johnson <web at matthew.ath.cx>"
+PR = "r1"
+
inherit java-library
-DEPENDS = "classpath-native classpath"
+DEPENDS = "classpath-native classpath fastjar-native"
SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz"
@@ -40,14 +42,14 @@ do_install() {
oe_jarinstall io-0.1.jar io.jar
oe_jarinstall unix-0.2.jar unix.jar
- oe_libinstall -so libcgi-java ${D}${libdir}/jni
- oe_libinstall -so libunix-java ${D}${libdir}/jni
+ oe_libinstall -so libcgi-java ${D}${libdir_jni}
+ oe_libinstall -so libunix-java ${D}${libdir_jni}
}
PACKAGES += "${PN}-jni ${PN}-jni-dbg"
RDEPENDS_${JPN} = "${PN}-jni"
-FILES_${PN}-jni = "${libdir}/jni/lib*.so"
-FILES_${PN}-jni-dbg = "${libdir}/jni/.debug/lib*.so"
+FILES_${PN}-jni = "${libdir_jni}/lib*.so"
+FILES_${PN}-jni-dbg = "${libdir_jni}/.debug/lib*.so"
#
# mt diff -rb459044149ae9e0fc21221903548ff66c0427cef -r3b5a264cff607e4c4977e318dde1e861a664ad81
#
#
#
# patch "packages/gcc/gcc-4.2.2.inc"
# from [6281a032714b397b43955b47208a1dd89efdd74b]
# to [95eb2c53a56331fe1ad715ff95b28751be2db521]
#
# patch "packages/gcc/gcc-4.3.0.inc"
# from [850acc9a5d1a62278c1db20cc938f2b7bd739aa5]
# to [323ce0b37791068a29c4c609dc7d22e5e111dfb1]
#
# patch "packages/gcc/gcc-cross_4.2.2.bb"
# from [0bd485fd64c5c34ee150e09c0e1260eebb2ff8e1]
# to [03fe6aeb1071c224e3e7f2f94784edc15939d6aa]
#
# patch "packages/gcc/gcc-cross_4.3.0.bb"
# from [4624dce6b1ba076d4ae2d489e5808e69f56fd1b9]
# to [9cd84c8b2ab3edb8dc72fcf69627b4428b4555f6]
#
# patch "packages/gcc/gcc-cross_csl-arm-2008q1.bb"
# from [8bae2d3dc0c0205410bf9e2f1c86270225679095]
# to [1cc9244426bd6437680f3c85cd1634ddb67311bb]
#
# patch "packages/gcc/gcc-csl-arm-2008q1.inc"
# from [b16cc5fbad679f5597b8947ce443ea4771251c69]
# to [d206c14474ea4fa6a19a3b51f36b9d4eef7e54b6]
#
# patch "packages/gcc/gcc-package-cross.inc"
# from [44d61d818cd61ba089dc92891fd289e5000a139c]
# to [dce3334b7fe1cb1b717d791e2ce4a7d68e9c79ce]
#
============================================================
--- packages/gcc/gcc-4.2.2.inc 6281a032714b397b43955b47208a1dd89efdd74b
+++ packages/gcc/gcc-4.2.2.inc 95eb2c53a56331fe1ad715ff95b28751be2db521
@@ -76,6 +76,6 @@ JAVA = ""
FORTRAN_linux-gnueabi = ",fortran"
JAVA = ""
-EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
ARM_INSTRUCTION_SET = "arm"
============================================================
--- packages/gcc/gcc-4.3.0.inc 850acc9a5d1a62278c1db20cc938f2b7bd739aa5
+++ packages/gcc/gcc-4.3.0.inc 323ce0b37791068a29c4c609dc7d22e5e111dfb1
@@ -67,5 +67,5 @@ JAVA = ""
FORTRAN = ""
JAVA = ""
-EXTRA_OECONF_BASE = " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_BASE = " --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
============================================================
--- packages/gcc/gcc-cross_4.2.2.bb 0bd485fd64c5c34ee150e09c0e1260eebb2ff8e1
+++ packages/gcc/gcc-cross_4.2.2.bb 03fe6aeb1071c224e3e7f2f94784edc15939d6aa
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
require gcc-${PV}.inc
require gcc-cross4.inc
============================================================
--- packages/gcc/gcc-cross_4.3.0.bb 4624dce6b1ba076d4ae2d489e5808e69f56fd1b9
+++ packages/gcc/gcc-cross_4.3.0.bb 9cd84c8b2ab3edb8dc72fcf69627b4428b4555f6
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
require gcc-${PV}.inc
require gcc-cross4.inc
============================================================
--- packages/gcc/gcc-cross_csl-arm-2008q1.bb 8bae2d3dc0c0205410bf9e2f1c86270225679095
+++ packages/gcc/gcc-cross_csl-arm-2008q1.bb 1cc9244426bd6437680f3c85cd1634ddb67311bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
require gcc-csl-arm-2008q1.inc
require gcc-cross4.inc
============================================================
--- packages/gcc/gcc-csl-arm-2008q1.inc b16cc5fbad679f5597b8947ce443ea4771251c69
+++ packages/gcc/gcc-csl-arm-2008q1.inc d206c14474ea4fa6a19a3b51f36b9d4eef7e54b6
@@ -44,7 +44,7 @@ FORTRAN = ""
#FORTRAN_linux-gnueabi = ",fortran"
#JAVA = ",java"
-EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
ARM_INSTRUCTION_SET = "arm"
addtask unpack2 after do_unpack before do_patch
============================================================
--- packages/gcc/gcc-package-cross.inc 44d61d818cd61ba089dc92891fd289e5000a139c
+++ packages/gcc/gcc-package-cross.inc dce3334b7fe1cb1b717d791e2ce4a7d68e9c79ce
@@ -2,11 +2,13 @@ INHIBIT_PACKAGE_STRIP = "1"
OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
INHIBIT_PACKAGE_STRIP = "1"
-PACKAGES = "libgcc libstdc++ libg2c libgfortran"
+PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran"
# Called from within gcc-cross, so libdir is set wrong
FILES_libg2c = "${target_libdir}/libg2c.so.*"
+FILES_libssp = "${target_libdir}/libssp.so.*"
+
FILES_libgfortran = "${target_libdir}/libgfortran.so.*"
FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
@@ -40,11 +42,13 @@ do_install () {
mv -f ${D}${prefix}/*/lib/nof/libstdc++.so* ${D}${target_libdir} || true
mv -f ${D}${prefix}/*/lib/nof/libg2c.so* ${D}${target_libdir} || true
mv -f ${D}${prefix}/*/lib/nof/libgfortran*.so* ${D}${target_libdir} || true
+ mv -f ${D}${prefix}/*/lib/nof/libssp*.so* ${D}${target_libdir} || true
else
mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true
mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true
+ mv -f ${D}${prefix}/*/lib/libssp*.so* ${D}${target_libdir} || true
fi
More information about the Openembedded-commits
mailing list