summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2012-01-06 12:54:46 +0100
committerHenning Heinold <heinold@inf.fu-berlin.de>2012-01-06 12:54:46 +0100
commit63fe5655ac40215e03c876246dc897252cd14031 (patch)
treeeeda8a3c93a878ccc3b345d9b988be840acf2e5f /recipes-core
parent43d1bde8dcda6d59f6c00ae010de63534f76bcc4 (diff)
downloadmeta-java-63fe5655ac40215e03c876246dc897252cd14031.tar.gz
openjdk-6: oenote -> bbnote transition, oeerror likewise
Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/openjdk/openjdk-6-common.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
index bc56105..f9cef5a 100644
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -181,7 +181,7 @@ do_configure_prepend() {
181 ln -sf ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/jre/lib/rt.jar ${WORKDIR}/fake-jdk/jre/lib/rt.jar 181 ln -sf ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/jre/lib/rt.jar ${WORKDIR}/fake-jdk/jre/lib/rt.jar
182 182
183 symlinked=false 183 symlinked=false
184 echo "Creating symlinks for fake-jdk" 184 bbnote "Creating symlinks for fake-jdk"
185 mkdir -p ${WORKDIR}/fake-jdk/include 185 mkdir -p ${WORKDIR}/fake-jdk/include
186 for i in `find ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/include` ;do 186 for i in `find ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/include` ;do
187 bn=`basename $i` 187 bn=`basename $i`
@@ -196,9 +196,9 @@ do_configure_prepend() {
196 # in such a complicated build can't be wrong. 196 # in such a complicated build can't be wrong.
197 if [ x$symlinked = xfalse ] 197 if [ x$symlinked = xfalse ]
198 then 198 then
199 echo"Build b0rken! Have not created any symlinks for fake-jdk!" 199 bberror "Build b0rken! Have not created any symlinks for fake-jdk!"
200 else 200 else
201 echo "fake-jdk setup appears sane." 201 bbnote "fake-jdk setup appears sane."
202 fi 202 fi
203} 203}
204 204
@@ -268,7 +268,7 @@ do_compilestepone() {
268 ln -s ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/lib/tools.jar bootstrap/ecj/lib/tools.jar 268 ln -s ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/lib/tools.jar bootstrap/ecj/lib/tools.jar
269 269
270 # First build hotspot to get a libjvm.so (to link corba in the icedtea-ecj build) 270 # First build hotspot to get a libjvm.so (to link corba in the icedtea-ecj build)
271 echo "1/3 Building Hotspot" 271 bbnote "1/3 Building Hotspot"
272 oe_runmake hotspot 272 oe_runmake hotspot
273 273
274 # Remove spurious libarch directory/symlink 274 # Remove spurious libarch directory/symlink
@@ -286,7 +286,7 @@ addtask compilestepone after do_configure before do_compilesteptwo
286 286
287# This part can be shared between cacao and hotspot-zero builds. 287# This part can be shared between cacao and hotspot-zero builds.
288do_compilesteptwo() { 288do_compilesteptwo() {
289 echo "2/3 Building bootstrap JDK" 289 bbnote "2/3 Building bootstrap JDK"
290 290
291 # Now cross-compile bootstrap JDK 291 # Now cross-compile bootstrap JDK
292 rm stamps/icedtea-against-ecj.stamp stamps/icedtea-ecj.stamp || true 292 rm stamps/icedtea-against-ecj.stamp stamps/icedtea-ecj.stamp || true
@@ -298,7 +298,7 @@ do_compilesteptwo() {
298 for F in `find ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin -type f` 298 for F in `find ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin -type f`
299 do 299 do
300 bf=`basename $F` 300 bf=`basename $F`
301 echo "Creating symlink for:" $bf 301 bbnote "Creating symlink for:" $bf
302 ln -sf $F bootstrap/icedtea/bin/$bf 302 ln -sf $F bootstrap/icedtea/bin/$bf
303 done 303 done
304} 304}
@@ -306,7 +306,7 @@ addtask compilesteptwo after do_compilestepone before do_compile
306 306
307do_compile() { 307do_compile() {
308 308
309 echo "3/3 Building final JDK" 309 bbnote "3/3 Building final JDK"
310 310
311 # Build the final Hotspot + OpenJDK 311 # Build the final Hotspot + OpenJDK
312 oe_runmake icedtea-against-icedtea \ 312 oe_runmake icedtea-against-icedtea \
@@ -327,7 +327,7 @@ do_install() {
327 for F in `find ${D}${JDK_HOME}/jre/bin -type f` 327 for F in `find ${D}${JDK_HOME}/jre/bin -type f`
328 do 328 do
329 bf=`basename $F` 329 bf=`basename $F`
330 echo "replace:" $bf 330 bbnote "replace:" $bf
331 rm ${D}${JDK_HOME}/bin/$bf 331 rm ${D}${JDK_HOME}/bin/$bf
332 ln -s ${JDK_HOME}/jre/bin/$bf ${D}${JDK_HOME}/bin/$bf 332 ln -s ${JDK_HOME}/jre/bin/$bf ${D}${JDK_HOME}/bin/$bf
333 done 333 done