aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo@ribalda.com>2019-07-05 13:18:22 +0200
committerRichard Leitner <richard.leitner@skidata.com>2019-07-09 14:39:58 +0200
commit1caa0e42e06c04199a1e8d802b7c0c83b7678dd6 (patch)
treed8fc49108d8684f0a5637ef4172b7f7323b23800
parent78a5fc8640ed5aa5f83647f12948dde24da19e57 (diff)
downloadmeta-java-1caa0e42e06c04199a1e8d802b7c0c83b7678dd6.tar.gz
meta-java-1caa0e42e06c04199a1e8d802b7c0c83b7678dd6.tar.bz2
meta-java-1caa0e42e06c04199a1e8d802b7c0c83b7678dd6.zip
xom: Allow re-running do_compile
do_compile modified the source directory destructively (mv and rm), avoiding its re-run. Fixes: ERROR: xom-1.2.10-r0 do_compile: Function failed: do_compile (log file is located at /workdir/build/tmp/work/dbfp4-poky-linux/xom/1.2.10-r0/temp/log.do_compile.1523) ERROR: Logfile of failure stored in: /workdir/build/tmp/work/dbfp4-poky-linux/xom/1.2.10-r0/temp/log.do_compile.1523 Log data follows: | DEBUG: Executing shell function do_compile | mv: cannot stat '/workdir/build/tmp/work/dbfp4-poky-linux/xom/1.2.10-r0/git/jaxen': No such file or directory | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_compile (log file is located at /workdir/build/tmp/work/dbfp4-poky-linux/xom/1.2.10-r0/temp/log.do_compile.1523) NOTE: recipe xom-1.2.10-r0: task do_compile: Failed ERROR: Task (/workdir/repo/poky/../meta-java/recipes-core/xml-commons/xom_1.2.10.bb:do_compile) failed with exit code '1' ERROR: mc:inteli7:xom-1.2.10-r0 do_compile: Function failed: do_compile (log file is located at /workdir/build/tmp/work/corei7-64-poky-linux/xom/1.2.10-r0/temp/log.do_compile.1522) Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
-rw-r--r--recipes-core/xml-commons/xom_1.2.10.bb12
1 files changed, 10 insertions, 2 deletions
diff --git a/recipes-core/xml-commons/xom_1.2.10.bb b/recipes-core/xml-commons/xom_1.2.10.bb
index 8755ddc..8b43c39 100644
--- a/recipes-core/xml-commons/xom_1.2.10.bb
+++ b/recipes-core/xml-commons/xom_1.2.10.bb
@@ -28,14 +28,22 @@ inherit java-library
DEPENDS = "fastjar-native virtual/javac-native xerces-j xalan-j"
+do_move_jaxen() {
+ if [ -d ${WORKDIR}/git ] ; then
+ mv ${WORKDIR}/git/jaxen ${WORKDIR}/jaxen-${PV_jaxen}
+ rm -rf ${WORKDIR}/git
+ fi
+
+}
+
+addtask move_jaxen after do_removebinaries before do_patch
+
do_compile() {
mkdir -p build
oe_makeclasspath cp -s xercesImpl xalan2
cp=build:$cp
- mv ${WORKDIR}/git/jaxen ${WORKDIR}/jaxen-${PV_jaxen}
- rm -rf ${WORKDIR}/git
scp="${WORKDIR}/jaxen-${PV_jaxen}/src/java/main"
javac -sourcepath src:$scp -cp $cp -d build `find src -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`