[oe-commits] org.oe.dev merge of 'c827a7afadeb81d1fe48c8ea8c9a4b0deb619d3d'

oe commit oe at amethyst.openembedded.net
Thu May 15 15:09:17 UTC 2008 

merge of 'c827a7afadeb81d1fe48c8ea8c9a4b0deb619d3d'
     and 'dacf750b2194987a8f9d9c98336cbca888ed01e0'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 8c0681c145743970130cbe62da92b45f76b3c4b5
ViewMTN: http://monotone.openembedded.org/revision/info/8c0681c145743970130cbe62da92b45f76b3c4b5
Files:
1
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
packages/classpath/classpath-native_0.97.1.bb
packages/docbook-utils/docbook-utils-native_0.6.13.bb
packages/docbook-utils/docbook-utils_0.6.13.bb
classes/java-library.bbclass
classes/java.bbclass
conf/distro/include/preferred-om-2008-versions.inc
Diffs:

#
# mt diff -rc827a7afadeb81d1fe48c8ea8c9a4b0deb619d3d -r8c0681c145743970130cbe62da92b45f76b3c4b5
#
#
#
# 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
 
 


#
# mt diff -rdacf750b2194987a8f9d9c98336cbca888ed01e0 -r8c0681c145743970130cbe62da92b45f76b3c4b5
#
#
#
# delete "packages/classpath/classpath-native_0.97.1.bb"
# 
# delete "packages/docbook-utils/docbook-utils-native_0.6.13.bb"
# 
# delete "packages/docbook-utils/docbook-utils_0.6.13.bb"
# 
# patch "classes/java-library.bbclass"
#  from [ba884554b916e0ee77988f7e42644eb50f0bcf92]
#    to [8663571955e5e7b94d365cb357c051df42196900]
# 
# patch "classes/java.bbclass"
#  from [4a470d4978ae2ef918625aa0f94f81ced60914df]
#    to [1cbaed96d4ed2a16236caaec74121c841339d213]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [1fa5768d601b1fc24f2f64c740c2e5fc96c4fce3]
#    to [5f9e99fa45dd0ff3b521383e4f8f11e144767fec]
#
============================================================
--- classes/java-library.bbclass	ba884554b916e0ee77988f7e42644eb50f0bcf92
+++ classes/java-library.bbclass	8663571955e5e7b94d365cb357c051df42196900
@@ -35,3 +35,24 @@ FILES_${JPN} = "${datadir_java}"
 
 FILES_${JPN} = "${datadir_java}"
 
+# File name of the libraries' main Jar file
+JARFILENAME = "${P}.jar"
+
+# Space-separated list of alternative file names.
+ALTJARFILENAMES = "${PN}.jar"
+
+java_install() {
+  oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES}
+}
+
+do_install() {
+  java_install
+}
+
+java_stage() {
+  oe_jarinstall -s ${JARFILENAME} ${ALTJARFILENAMES}
+}
+
+do_stage() {
+  java_stage
+}
============================================================
--- classes/java.bbclass	4a470d4978ae2ef918625aa0f94f81ced60914df
+++ classes/java.bbclass	1cbaed96d4ed2a16236caaec74121c841339d213
@@ -61,6 +61,41 @@ oe_jarinstall() {
   done
 }
 
+oe_makeclasspath() {
+  # Purpose: Generate a classpath variable from the given Jar file names
+  # where the ".jar" has been omitted.
+  #
+  # oe_makeclasspath foo baz bar
+  # Prints ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar
+  #
+  # oe_makeclasspath -s foo baz bar
+  # Prints ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar
+  #
+  # Provide the -s at the beginning otherwise strange things happen.
+  #
+  dir=${datadir_java}
+	classpath=
+	delimiter=
+
+  while [ "$#" -gt 0 ]; do
+    case "$1" in
+    -s)
+      dir=${STAGING_DATADIR_JAVA}
+      ;;
+    -*)
+      oefatal "oe_makeclasspath: unknown option: $1"
+      ;;
+    *)
+      classpath=$classpath$delimiter$dir/$1.jar
+      delimiter=":"
+      ;;
+    esac
+    shift
+  done
+
+	echo $classpath
+}
+
 # Creates a simple wrapper script for your Java program.
 # The script is written to ${PN} by default. 
 #
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	1fa5768d601b1fc24f2f64c740c2e5fc96c4fce3
+++ conf/distro/include/preferred-om-2008-versions.inc	5f9e99fa45dd0ff3b521383e4f8f11e144767fec
@@ -263,8 +263,8 @@ PREFERRED_VERSION_dnsmasq ?= "2.38"
 PREFERRED_VERSION_djvulibre ?= "3.5.19"
 PREFERRED_VERSION_dmxproto ?= "2.2.2"
 PREFERRED_VERSION_dnsmasq ?= "2.38"
-PREFERRED_VERSION_docbook-utils ?= "0.6.13"
-PREFERRED_VERSION_docbook-utils-native ?= "0.6.13"
+PREFERRED_VERSION_docbook-utils ?= "0.6.14"
+PREFERRED_VERSION_docbook-utils-native ?= "0.6.14"
 PREFERRED_VERSION_dosbox ?= "0.70"
 PREFERRED_VERSION_dosfstools ?= "2.11"
 PREFERRED_VERSION_dosfstools-native ?= "2.10"

More information about the Openembedded-commits mailing list