[oe] [meta-oe][PATCH v2] fwts: Update to 19.06.00
Update to latest release.
Since version 18.08.00, libbsd is a dependency:
https://wiki.ubuntu.com/FirmwareTestSuite/ReleaseNotes/18.08.00
Signed-off-by: Ricardo Ribalda Delgado
---
.../fwts/0001-Remove-Werror-from-build.patch | 22 ++---
...t-logical-operand-warning-with-clang.patch | 84 ---
.../fwts/{fwts_git.bb => fwts_19.06.00.bb}| 11 +--
3 files changed, 15 insertions(+), 102 deletions(-)
delete mode 100644
meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch
rename meta-oe/recipes-test/fwts/{fwts_git.bb => fwts_19.06.00.bb} (83%)
diff --git a/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch
b/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch
index 611ccc8fc..6795ba849 100644
--- a/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch
+++ b/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch
@@ -12,33 +12,33 @@ Upstream-Status: Pending
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 4daa9e8f..873f23eb 100644
+index 62c9ba8..435ec23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
- `pkg-config --silence-errors --cflags json` \
- `pkg-config --silence-errors --cflags json-c` \
+ `pkg-config --silence-errors --cflags json` \
+ `pkg-config --silence-errors --cflags json-c` \
-pthread `pkg-config --cflags glib-2.0 gio-2.0` \
-- -Wall -Werror -Wextra
-+ -Wall -Wextra
+- -Wall -Werror -Wextra \
++ -Wall -Wextra \
+ -Wno-address-of-packed-member
bin_PROGRAMS = fwts
-
diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
-index fa232451..082403a2 100644
+index 6bcf9f8..de89bf1 100644
--- a/src/lib/src/Makefile.am
+++ b/src/lib/src/Makefile.am
@@ -24,7 +24,7 @@ AM_CPPFLAGS = \
`pkg-config --silence-errors --cflags json-c` \
`pkg-config --cflags glib-2.0 gio-2.0` \
-DDATAROOTDIR=\"$(datarootdir)\"\
-- -Wall -Werror -Wextra
-+ -Wall -Wextra
+- -Wall -Werror -Wextra \
++ -Wall -Wextra \
+ -Wno-address-of-packed-member
pkglib_LTLIBRARIES = libfwts.la
-
diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am
-index aa37de55..4d5297cc 100644
+index 21f969e..82009a0 100644
--- a/src/utilities/Makefile.am
+++ b/src/utilities/Makefile.am
@@ -16,7 +16,7 @@
diff --git
a/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch
b/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch
deleted file mode 100644
index ae3665b4d..0
---
a/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 5bd05ad8569880985ddf6d4c06ed927d388c297f Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Wed, 19 Oct 2016 01:57:16 +
-Subject: [PATCH] ignore constant-logical-operand warning with clang
-
-Signed-off-by: Khem Raj
-
- src/dmi/dmicheck/dmicheck.c| 3 +++
- src/lib/src/fwts_acpi_tables.c | 5 +
- src/uefi/uefirtauthvar/uefirtauthvar.c | 5 +
- 3 files changed, 13 insertions(+)
-
-diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c
-index 3cca9db9..60fb758f 100644
a/src/dmi/dmicheck/dmicheck.c
-+++ b/src/dmi/dmicheck/dmicheck.c
-@@ -211,6 +211,8 @@ static const char *uuid_patterns[] = {
- "0A0A0A0A-0A0A-0A0A-0A0A-0A0A0A0A0A0A",
- NULL,
- };
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wunneeded-internal-declaration"
-
- static const fwts_chassis_type_map fwts_dmi_chassis_type[] = {
- { "Invalid",FWTS_SMBIOS_CHASSIS_INVALID },
-@@ -251,6 +253,7 @@ static const fwts_chassis_type_map fwts_dmi_chassis_type[]
= {
- { "Mini PC",FWTS_SMBIOS_CHASSIS_MINI_PC },
- { "Stick PC", FWTS_SMBIOS_CHASSIS_STICK_PC },
- };
-+#pragma clang diagnostic pop
-
- /* Remapping table from buggy version numbers to correct values */
- static const fwts_dmi_version dmi_versions[] = {
-diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
-index c7ba59be..bdd224aa 100644
a/src/lib/src/fwts_acpi_tables.c
-+++ b/src/lib/src/fwts_acpi_tables.c
-@@ -393,10 +393,14 @@ static int fwts_acpi_handle_fadt(
- /* Determine FACS addr and load it.
-* Will ignore the missing FACS in the hardware-reduced mode.
-*/
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Waddress-of-packed-member"
-+
- result = fwts_acpi_handle_fadt_tables(fw, fadt,
- "FACS", "FIRMWARE_CTRL", "X_FIRMWARE_C
[oe] WARNING: on wrong $PACKAGE_ARCH
Hello On our organisation ( qtec.com ) we support a distribution on multiple architectures and machines. Since the introduction of multiconfig we have a single builder and a single package repository, what we really appreciate. Unfortunately, there is one single frustration, and is "wrong" PACKAGE_ARCH. For example: - -native packages that DEPEND on non-native recipes - tune-arch that have some variable dependency on MACHINE Some of this errors result the same workdir used twice and invalid packages. Debugging such errors is not trivial, involves horrible error messages, bitbake-diffsigs and non deterministic errors (the build order can hide such errors), So I was thinking that perhaps I could implement some tests such as: - all and native can only depend on -native - tunearch cannot depend on machine I HAVE NO IDEA how difficult could it be, but before implementing I would like to know if that is something that upstream would be interested in, because if it is not upstream I will have hard time convincing my management for getting the hours required. What is your opinion? Regards! -- Ricardo Ribalda -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 17/23] jaxen: Do not build an all PACKAGE_ARCH
jaxen depends on non -native recipes and breaks multiconfig.
Fixes:
| 138 problems (138 warnings)rm: cannot remove 'build/org/jdom/input':
Directory not empty
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_compile (log file is located at
/workdir/build/tmp/work/all-poky-linux/jaxen/1.1.6-r0/temp/log.do_compile.21778)
NOTE: recipe jaxen-1.1.6-r0: task do_compile: Failed
ERROR: Task
(multiconfig:inteli7:/workdir/repo/poky/../meta-java/recipes-core/xml-commons/jaxen_1.1.6.bb:do_compile)
failed with exit code '1'
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xml-commons/jaxen_1.1.6.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/xml-commons/jaxen_1.1.6.bb
b/recipes-core/xml-commons/jaxen_1.1.6.bb
index d75ce75..2741f2c 100644
--- a/recipes-core/xml-commons/jaxen_1.1.6.bb
+++ b/recipes-core/xml-commons/jaxen_1.1.6.bb
@@ -23,6 +23,8 @@ SRC_URI[jdom.sha256sum] =
"a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d
S = "${WORKDIR}/git/jaxen"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
do_compile() {
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 22/23] jdom: Do not use all as PACKAGE_ARCH
It DEPENDS on packages that are not -native.
Fixes:
ERROR: mc:qt5506:jdom-1.1.3-r0 do_package: Package already staged
(/workdir/build/tmp/sstate-control/manifest-allarch-jdom.package)?!
ERROR: mc:qt5506:jdom-1.1.3-r0 do_package:
ERROR: mc:qt5506:jdom-1.1.3-r0 do_package: Function failed: sstate_task_postfunc
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/temp/log.do_package.5632
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xml-commons/jdom_1.1.3.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/xml-commons/jdom_1.1.3.bb
b/recipes-core/xml-commons/jdom_1.1.3.bb
index 8073819..df9125d 100644
--- a/recipes-core/xml-commons/jdom_1.1.3.bb
+++ b/recipes-core/xml-commons/jdom_1.1.3.bb
@@ -12,6 +12,8 @@ SRC_URI =
"http://www.jdom.org/dist/source/archive/jdom-${PV}.tar.gz;
SRC_URI[md5sum] = "dc8391e84cfdb170fcd8279aa370019f"
SRC_URI[sha256sum] =
"d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47bd8d1f"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
S = "${WORKDIR}/${PN}"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 20/23] poi: Do not build as all PACKAGE_ARCH
poi DEPENDS on non -native packages, which breaks multiconfig.
Fixes:
ERROR: mc:inteli7:poi-3.0-r0 do_packagedata: Command 'cd
/workdir/build/tmp/work/all-poky-linux/poi/3.0-r0/pkgdata; find . -type d
-print | tar --xattrs --xattrs-include='*' -cf - -S -C
/workdir/build/tmp/work/all-poky-linux/poi/3.0-r0/pkgdata -p --no-recursion
--files-from - | tar --xattrs --xattrs-include='*' -xhf - -C
/workdir/build/tmp/pkgdata/inteli7' returned non-zero exit status 2
ERROR: mc:inteli7:poi-3.0-r0 do_packagedata: Function failed:
sstate_task_postfunc
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/poi/3.0-r0/temp/log.do_packagedata.27730
NOTE: recipe poi-3.0-r0: task do_packagedata: Failed
ERROR: Task
(multiconfig:inteli7:/workdir/repo/poky/../meta-java/recipes-core/jakarta-libs/poi_3.0.bb:do_packagedata)
failed with exit code '1'
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/jakarta-libs/poi_3.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/jakarta-libs/poi_3.0.bb
b/recipes-core/jakarta-libs/poi_3.0.bb
index f9178f2..e33f2f2 100644
--- a/recipes-core/jakarta-libs/poi_3.0.bb
+++ b/recipes-core/jakarta-libs/poi_3.0.bb
@@ -7,6 +7,8 @@ SRC_URI =
"http://archive.apache.org/dist/jakarta/poi/release/src/${BPN}-src-${P
S = "${WORKDIR}/${BPN}-3.0-rc4"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
DEPENDS = "fastjar-native commons-collections3 commons-logging commons-lang
commons-beanutils log4j1.2 xalan-j"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 23/23] dom4j: Do not use all as PACKAGE_ARCH
It has DEPENDS that are not -native
Fixes:
ERROR: mc:qt5506:dom4j-1.6.1-r0 do_packagedata: Error executing a python
function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:sstate_task_postfunc(d)
0003:
File: '/workdir/repo/poky/meta/classes/sstate.bbclass', lineno: 739, function:
sstate_task_postfunc
0735:
0736:sstateinst = d.getVar("SSTATE_INSTDIR")
0737:d.setVar('SSTATE_FIXMEDIR', shared_state['fixmedir'])
0738:
*** 0739:sstate_installpkgdir(shared_state, d)
0740:
0741:bb.utils.remove(d.getVar("SSTATE_BUILDDIR"), recurse=True)
0742:}
0743:sstate_task_postfunc[dirs] = "${WORKDIR}"
File: '/workdir/repo/poky/meta/classes/sstate.bbclass', lineno: 379, function:
sstate_installpkgdir
0375:oe.path.remove(dir)
0376:
0377:for state in ss['dirs']:
0378:prepdir(state[1])
*** 0379:os.rename(sstateinst + state[0], state[1])
0380:sstate_install(ss, d)
0381:
0382:for plain in ss['plaindirs']:
0383:workdir = d.getVar('WORKDIR')
Exception: FileNotFoundError: [Errno 2] No such file or directory:
'/workdir/build/tmp/work/all-poky-linux/dom4j/1.6.1-r0/sstate-build-packagedata/pkgdata'
->
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xml-commons/dom4j_1.6.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-core/xml-commons/dom4j_1.6.1.bb
b/recipes-core/xml-commons/dom4j_1.6.1.bb
index 97c9947..ee46dfd 100644
--- a/recipes-core/xml-commons/dom4j_1.6.1.bb
+++ b/recipes-core/xml-commons/dom4j_1.6.1.bb
@@ -18,6 +18,7 @@ SRC_URI[archive.sha256sum] =
"01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e192
SRC_URI[jaxme.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4"
SRC_URI[jaxme.sha256sum] =
"0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
inherit java-library
do_compile() {
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 19/23] bsf: Do not build as all PACKAGE_ARCH
The package DEPENDS on non -native package, which breaks multiconfig.
Fixes:
NOTE: recipe bsf-2.4.0-r1: task do_package: Succeeded
ERROR: mc:qt5507:bsf-2.4.0-r1 do_package: Error executing a python function in
exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:populate_packages(d)
0003:
File: '/workdir/repo/poky/meta/classes/package.bbclass', lineno: 1237,
function: populate_packages
1233:
1234:mkdir_recurse(dvar, root, os.path.dirname(file))
1235:fpath = os.path.join(root,file)
1236:if not cpath.islink(file):
*** 1237:os.link(file, fpath)
1238:continue
1239:ret = bb.utils.copyfile(file, fpath)
1240:if ret is False or ret == 0:
1241:bb.fatal("File population failed")
Exception: FileExistsError: [Errno 17] File exists:
'./usr/share/java/bsf-2.4.0.jar' ->
'/workdir/build/tmp/work/all-poky-linux/bsf/2.4.0-r1/packages-split/libbsf-java/./usr/share/java/bsf-2.4.0.jar'
ERROR: mc:qt5507:bsf-2.4.0-r1 do_package: [Errno 17] File exists:
'./usr/share/java/bsf-2.4.0.jar' ->
'/workdir/build/tmp/work/all-poky-linux/bsf/2.4.0-r1/packages-split/libbsf-java/./usr/share/java/bsf-2.4.0.jar'
ERROR: mc:qt5507:bsf-2.4.0-r1 do_package: Function failed: populate_packages
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/bsf/2.4.0-r1/temp/log.do_package.12673
NOTE: recipe bsf-2.4.0-r1: task do_package: Failed
ERROR: Task
(multiconfig:qt5507:/workdir/repo/poky/../meta-java/recipes-core/jakarta-libs/bsf_2.4.0.bb:do_package)
failed with exit code '1'
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/jakarta-libs/bsf_2.4.0.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-core/jakarta-libs/bsf_2.4.0.bb
b/recipes-core/jakarta-libs/bsf_2.4.0.bb
index 1037396..a79cbf4 100644
--- a/recipes-core/jakarta-libs/bsf_2.4.0.bb
+++ b/recipes-core/jakarta-libs/bsf_2.4.0.bb
@@ -1,11 +1,13 @@
SUMMARY = "Bean Scripting Framework package"
AUTHOR = "Apache Software Foundation"
LICENSE = "Apache-2.0"
-PR = "r1"
+PR = "r2"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3"
SRC_URI =
"http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-${PV}.tar.gz;
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
DEPENDS = "jacl commons-logging rhino xalan-j bcel"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 21/23] 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
---
recipes-core/xml-commons/xom_1.2.10.bb | 12 ++--
1 file 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*" \)`
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 15/23] xalan-j: Do not use all as PACKAGE_ARCH
It has DEPENDS that are not -native.
Fixes:
ERROR: mc:inteli7:xalan-j-2.7.1-r1 do_package: Error executing a python
function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:emit_pkgdata(d)
0003:
File: '/workdir/repo/poky/meta/classes/package.bbclass', lineno: 1502,
function: emit_pkgdata
1498:allow_empty = d.getVar('ALLOW_EMPTY_%s' % pkg)
1499:if not allow_empty:
1500:allow_empty = d.getVar('ALLOW_EMPTY')
1501:root = "%s/%s" % (pkgdest, pkg)
*** 1502:os.chdir(root)
1503:g = glob('*')
1504:if g or allow_empty == "1":
1505:# Symlinks needed for reverse lookups (from the final
package name)
1506:subdata_sym = pkgdatadir + "/runtime-reverse/%s" % pkgval
Exception: FileNotFoundError: [Errno 2] No such file or directory:
'/workdir/build/tmp/work/all-poky-linux/xalan-j/2.7.1-r1/packages-split/xalan-j-src'
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xalan-j/xalan-j_2.7.1.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-core/xalan-j/xalan-j_2.7.1.bb
b/recipes-core/xalan-j/xalan-j_2.7.1.bb
index 7c68fba..ad985cb 100644
--- a/recipes-core/xalan-j/xalan-j_2.7.1.bb
+++ b/recipes-core/xalan-j/xalan-j_2.7.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
AUTHOR = "Apache Software Foundation"
HOMEPAGE = "http://xml.apache.org/xalan-j;
-PR = "r1"
+PR = "r2"
DEPENDS = "xerces-j regexp jlex cup jaxp1.3 bcel"
@@ -18,6 +18,8 @@ SRC_URI = "\
S = "${WORKDIR}/${BPN}_2_7_1"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
JPN = "libxalan2-java"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 18/23] jlex: Do not build as an all PACKAGE_ARCH
jlex RDEPENDS on non -all package and breaks multiconfig.
Fixes:
ERROR: mc:qt5506:jlex-1.2.6-r0 do_package_write_deb: Fatal errors occurred in
subprocesses:
Command
'PATH="/workdir/build/tmp/sysroots-uninative/x86_64-linux/usr/bin:/workdir/repo/poky/scripts:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/usr/bin/allarch-poky-linux:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot/usr/bin/crossscripts:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/usr/sbin:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/usr/bin:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/sbin:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/bin:/workdir/repo/poky/bitbake/bin:/workdir/build/tmp/hosttools"
dpkg-deb -b
/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/packages-split/jlex
/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/deploy-debs/all' returned
non-zero exit status 2
Subprocess output:dpkg-deb: building package 'jlex' in
'/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/deploy-debs/all'.
dpkg-deb: error: unable to create
'/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/deploy-debs/all': No such
file or directory
ERROR: mc:qt5506:jlex-1.2.6-r0 do_package_write_deb:
ERROR: mc:qt5506:jlex-1.2.6-r0 do_package_write_deb: Function failed:
do_package_deb
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/temp/log.do_package_write_deb.1491
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/jlex/jlex_1.2.6.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/jlex/jlex_1.2.6.bb b/recipes-core/jlex/jlex_1.2.6.bb
index 45d76ed..b8f9ffb 100644
--- a/recipes-core/jlex/jlex_1.2.6.bb
+++ b/recipes-core/jlex/jlex_1.2.6.bb
@@ -3,6 +3,8 @@ AUTHOR = "Elliot Berk, A. Appel, C. Scott Ananian"
LICENSE = "JLEX"
LIC_FILES_CHKSUM =
"file://Main.java;beginline=148;endline=166;md5=9bf4a6a951053991db64f9d7330d648a"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
RDEPENDS_${PN} = "java2-runtime"
RDEPENDS_${PN}_class-native = ""
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 12/23] dbus-java: Do not use all as PACKAGE_ARCH
dbus-java has RDEPEND that are not PACKAGE_ARCH=all
Fixes:
ERROR: dbus-java-2.7-r0 do_populate_sysroot_setscene: Error executing a python
function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:do_populate_sysroot_setscene(d)
0003:
File: '/workdir/repo/poky/meta/classes/staging.bbclass', lineno: 126, function:
do_populate_sysroot_setscene
0122:do_populate_sysroot[sstate-outputdirs] =
"${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
0123:do_populate_sysroot[sstate-fixmedir] =
"${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
0124:
0125:python do_populate_sysroot_setscene () {
*** 0126:sstate_setscene(d)
0127:}
0128:addtask do_populate_sysroot_setscene
0129:
0130:def staging_copyfile(c, target, dest, postinsts, seendirs):
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-extended/dbus/dbus-java_2.7.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/recipes-extended/dbus/dbus-java_2.7.bb
b/recipes-extended/dbus/dbus-java_2.7.bb
index 0b093a0..dfd2ff1 100644
--- a/recipes-extended/dbus/dbus-java_2.7.bb
+++ b/recipes-extended/dbus/dbus-java_2.7.bb
@@ -11,7 +11,10 @@ RDEPENDS_${PN}-viewer = "java2-runtime libunixsocket-java
${PN}-bin libmatthew-d
RDEPENDS_${PN}-bin = "java2-runtime libunixsocket-java libmatthew-debug-java
${JPN}"
RSUGGESTS_${JPN} = "libunixsocket-java"
-PR = "r0"
+PR = "r1"
+
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
LIC_FILES_CHKSUM = "file://COPYING;md5=72cc739fb93ae32741edbae802490e92"
SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz;
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 16/23] xom: Do not use all as PACKAGE_ARCH
It RDEPENDS on packages that ar not PACKAGE_ARCH=all
Fixes:
ERROR: mc:qt5507:xom-1.2.10-r0 do_compile: Function failed: do_compile (log
file is located at
/workdir/build/tmp/work/all-poky-linux/xom/1.2.10-r0/temp/log.do_compile.3256)
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/xom/1.2.10-r0/temp/log.do_compile.3256
Log data follows:
| DEBUG: Executing shell function do_compile
| mv: cannot stat
'/workdir/build/tmp/work/all-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/all-poky-linux/xom/1.2.10-r0/temp/log.do_compile.3256)
NOTE: recipe xom-1.2.10-r0: task do_compile: Failed
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xml-commons/xom_1.2.10.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/xml-commons/xom_1.2.10.bb
b/recipes-core/xml-commons/xom_1.2.10.bb
index 0e923d4..8755ddc 100644
--- a/recipes-core/xml-commons/xom_1.2.10.bb
+++ b/recipes-core/xml-commons/xom_1.2.10.bb
@@ -22,6 +22,8 @@ SRC_URI[archive.sha256sum] =
"39985c2debb8044005fd07b09cb06f10e75652b3c048c9b443
S = "${WORKDIR}/XOM"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
DEPENDS = "fastjar-native virtual/javac-native xerces-j xalan-j"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 10/23] jamvm: Fix binary name for javac
ecj-initial-native is not a dependency, and even if we add it, we get a
compilation error.
Fixes:
| /bin/bash:
/workdir/build/tmp/work/dbfp4-poky-linux/jamvm/2.0.0-devel+gitAUTOINC+6cef41d859-r0/recipe-sysroot-native/usr/bin/ecj-initial:
No such file or directory
| Makefile:663: recipe for target 'classes.zip' failed
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/jamvm/jamvm.inc | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc
index fc21380..cdf087e 100644
--- a/recipes-core/jamvm/jamvm.inc
+++ b/recipes-core/jamvm/jamvm.inc
@@ -34,8 +34,11 @@ EXTRA_OECONF = "--with-classpath-install-dir=${prefix}
--libdir=${libdir}/jamvm
# Needed for big compilation targets like OpenJDK
CFLAGS_append_class-native = " -DDEFAULT_MAX_HEAP=1024*MB"
+EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/javac \
+GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \
+ "
# Enforce usage of ecj-initial.
-EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \
+EXTRA_OEMAKE_class-native = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \
GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \
"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 14/23] ca-certificates: Cannot be an allarch package
It RDEPENDS on PACKAGE_ARCH!=all packages
Signed-off-by: Ricardo Ribalda Delgado
---
.../ca-certificates-java/ca-certificates-java_20180516.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
index 2db1915..feaa7dc 100644
--- a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
+++ b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
@@ -24,7 +24,7 @@ SRC_URI = "\
SRCREV = "793b846dcd4e79371bbe8069e4125ec2fd462e57"
-inherit java allarch
+inherit java
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 13/23] rhino: Do not use all as PACKAGE_ARCH
rhino has RDEPEND that are not PACKAGE_ARCH=all
Fixes:
ERROR: mc:inteli7:rhino-1.7r4-r0 do_package_write_deb_setscene: Error executing
a python function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:do_package_write_deb_setscene(d)
0003:
File: '/workdir/repo/poky/meta/classes/package_deb.bbclass', lineno: 296,
function: do_package_write_deb_setscene
0292:
0293:if os.access(os.path.join(tmpdir, "stamps",
"DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
0294:os.unlink(os.path.join(tmpdir, "stamps",
"DEB_PACKAGE_INDEX_CLEAN"))
0295:
*** 0296:sstate_setscene(d)
0297:}
0298:addtask do_package_write_deb_setscene
0299:
0300:python () {
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/rhino/rhino_1.7r4.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/rhino/rhino_1.7r4.bb
b/recipes-core/rhino/rhino_1.7r4.bb
index 0a84473..4242005 100644
--- a/recipes-core/rhino/rhino_1.7r4.bb
+++ b/recipes-core/rhino/rhino_1.7r4.bb
@@ -6,6 +6,8 @@ DEPENDS_class-native += "classpath-native"
BBCLASSEXTEND = "native"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
SRC_URI = "\
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 08/23] jdon: Fix location of S
Otherwise License files cannot be found.
Fixes:
WARNING: jdom-1.1.3-r0 do_populate_lic: Could not copy license file
/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/jdom-1.1.3/LICENSE.txt to
/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/license-destdir/jdom/LICENSE.txt:
[Errno 2] No such file or directory:
'/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/jdom-1.1.3/LICENSE.txt'
ERROR: jdom-1.1.3-r0 do_populate_lic: QA Issue: jdom: LIC_FILES_CHKSUM points
to an invalid file:
/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/jdom-1.1.3/LICENSE.txt
[license-checksum]
ERROR: jdom-1.1.3-r0 do_populate_lic: Fatal QA errors found, failing task.
ERROR: jdom-1.1.3-r0 do_populate_lic:
ERROR: jdom-1.1.3-r0 do_populate_lic: Function failed: populate_lic_qa_checksum
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/temp/log.do_populate_lic.4246
ERROR: Task
(/workdir/repo/poky/../meta-java/recipes-core/xml-commons/jdom_1.1.3.bb:do_populate_lic)
failed with exit code '1'
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xml-commons/jdom_1.1.3.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/xml-commons/jdom_1.1.3.bb
b/recipes-core/xml-commons/jdom_1.1.3.bb
index 8997bcc..8073819 100644
--- a/recipes-core/xml-commons/jdom_1.1.3.bb
+++ b/recipes-core/xml-commons/jdom_1.1.3.bb
@@ -14,6 +14,8 @@ SRC_URI[sha256sum] =
"d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47
inherit java-library
+S = "${WORKDIR}/${PN}"
+
do_compile() {
mkdir -p build
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 09/23] rxtx: Fix path of javac
rxtx was wrongly using the patch from cacao sysroot. Fixes: | /bin/bash: /workdir/build/tmp/work/x86_64-linux/cacao-native/1.6.1-r0/recipe-sysroot-native/usr/bin/javac: No such file or directory | Makefile:834: recipe for target '/workdir/build/tmp/work/dbfp4-poky-linux/rxtx/2.2.0-r2/rxtx-2.2pre2/gnu/io/UnsupportedCommOperationException.class' failed | make: *** [/workdir/build/tmp/work/dbfp4-poky-linux/rxtx/2.2.0-r2/rxtx-2.2pre2/gnu/io/UnsupportedCommOperationException.class] Error 127 | make: *** Waiting for unfinished jobs Signed-off-by: Ricardo Ribalda Signed-off-by: Ricardo Ribalda Delgado --- recipes-extended/rxtx/files/javapath.patch | 23 ++ recipes-extended/rxtx/rxtx_2.2.0.bb| 5 +++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 recipes-extended/rxtx/files/javapath.patch diff --git a/recipes-extended/rxtx/files/javapath.patch b/recipes-extended/rxtx/files/javapath.patch new file mode 100644 index 000..e0c1737 --- /dev/null +++ b/recipes-extended/rxtx/files/javapath.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate + +Signed-off-by: Ricardo Ribalda + +diff --git a/configure.in b/configure.in +index 1778a52..344f5ac 100644 +--- a/configure.in b/configure.in +@@ -484,10 +484,10 @@ if test "$CC" = "gcc" || test "$CC"="egcs"; then + ;; + *) + find_java_native_include jni_md.h +- JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni" +- JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3" +- JAR="\$(JPATH)/bin/jar" +- JAVADOC="\$(JPATH)/bin/javadoc" ++ JAVAH="gjavah -classpath \$(CLASSPATH) -d \$(DEST) -jni" ++ JAVAC="javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3" ++ JAR="fastjar" ++ JAVADOC="javadoc" + CFLAGS=$CFLAGS" -D_BSD_SOURCE" + ;; + esac diff --git a/recipes-extended/rxtx/rxtx_2.2.0.bb b/recipes-extended/rxtx/rxtx_2.2.0.bb index d4fbb9d..87d84a8 100644 --- a/recipes-extended/rxtx/rxtx_2.2.0.bb +++ b/recipes-extended/rxtx/rxtx_2.2.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Full Java CommAPI implementation" DEPENDS = "virtual/javac-native" LICENSE = "RXTXv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=32303a23463f90b12a7d1dafb8deabf4" -PR = "r2" +PR = "r3" SRC_URI = "http://rxtx.qbang.org/pub/rxtx/rxtx-2.2pre2.zip \ file://zsystem_init_exception.patch \ @@ -19,7 +19,8 @@ SRC_URI = "http://rxtx.qbang.org/pub/rxtx/rxtx-2.2pre2.zip \ file://usb_38400.patch \ file://fix_snprintf.patch \ file://format_security.patch \ - file://0001-Support-Freescale-i.MX-serial-ports.patch" + file://0001-Support-Freescale-i.MX-serial-ports.patch \ + file://javapath.patch" SRC_URI[md5sum] = "7eedb18e3f33a427e2b0e9be8ce3f94c" SRC_URI[sha256sum] = "3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03" -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 11/23] cup: Do not use all as PACKAGE_ARCH
cup has RDEPEND that are not PACKAGE_ARCH=all
Fixes:
ERROR: mc:qt5022:cup-0.10k-r0 do_package_write_deb_setscene: Error executing a
python function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:do_package_write_deb_setscene(d)
0003:
File: '/workdir/repo/poky/meta/classes/package_deb.bbclass', lineno: 296,
function: do_package_write_deb_setscene
0292:
0293:if os.access(os.path.join(tmpdir, "stamps",
"DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
0294:os.unlink(os.path.join(tmpdir, "stamps",
"DEB_PACKAGE_INDEX_CLEAN"))
0295:
*** 0296:sstate_setscene(d)
0297:}
0298:addtask do_package_write_deb_setscene
0299:
0300:python () {
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/cup/cup_0.10k.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-core/cup/cup_0.10k.bb b/recipes-core/cup/cup_0.10k.bb
index 7792c62..3ce5a21 100644
--- a/recipes-core/cup/cup_0.10k.bb
+++ b/recipes-core/cup/cup_0.10k.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM =
"file://${WORKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c
RDEPENDS_${PN} = "java2-runtime"
RDEPENDS_${PN}_class-native = ""
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
inherit java-library
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 04/23] classpath: Fix build with targets aarch64
Fixes: | In file included from ../../../classpath-0.99/native/fdlibm/fdlibm.h:36, | from ../../../classpath-0.99/native/fdlibm/e_exp.c:76: | ../../../classpath-0.99/native/fdlibm/ieeefp.h:163:2: error: #error Endianess not declared!! | #error Endianess not declared!! | ^ | In file included from ../../classpath-0.99/native/fdlibm/fdlibm.h:40, Signed-off-by: Ricardo Ribalda Delgado --- .../classpath/classpath-0.99/aarch64.patch| 19 +++ recipes-core/classpath/classpath_0.99.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 recipes-core/classpath/classpath-0.99/aarch64.patch diff --git a/recipes-core/classpath/classpath-0.99/aarch64.patch b/recipes-core/classpath/classpath-0.99/aarch64.patch new file mode 100644 index 000..4de40fb --- /dev/null +++ b/recipes-core/classpath/classpath-0.99/aarch64.patch @@ -0,0 +1,19 @@ +Upstream-Status: Inappropriate [upstream is dead] + +Signed-off-by: Ricardo Ribalda + +diff --git a/native/fdlibm/ieeefp.h b/native/fdlibm/ieeefp.h +index c230bbb..700dd3a 100644 +--- a/native/fdlibm/ieeefp.h b/native/fdlibm/ieeefp.h +@@ -158,6 +158,10 @@ + #define __IEEE_BIG_ENDIAN + #endif + ++#ifdef __aarch64__ ++#define __IEEE_LITTLE_ENDIAN ++#endif ++ + #ifndef __IEEE_BIG_ENDIAN + #ifndef __IEEE_LITTLE_ENDIAN + #error Endianess not declared!! diff --git a/recipes-core/classpath/classpath_0.99.bb b/recipes-core/classpath/classpath_0.99.bb index 6aa3baa..714503a 100644 --- a/recipes-core/classpath/classpath_0.99.bb +++ b/recipes-core/classpath/classpath_0.99.bb @@ -14,6 +14,7 @@ SRC_URI += " \ file://toolwrapper-exithook.patch \ file://use_libdir.patch \ file://freetype2.patch \ +file://aarch64.patch \ " SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 06/23] cacao: Do not build for aarch64 targets
Avoids:
| configure: error: aarch64 systems are currently not supported.
| NOTE: The following config.log files may provide further information.
| NOTE:
/workdir/build/tmp/work/aarch64-poky-linux/cacao/1.6.1-r0/cacao-1.6.1/src/mm/boehm-gc/libatomic_ops/config.log
/workdir/build/tmp/work/aarch64-poky-linux/cacao/1.6.1-r0/cacao-1.6.1/config.log
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/cacao/cacao_2d6f6c14daf9.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/cacao/cacao_2d6f6c14daf9.bb
b/recipes-core/cacao/cacao_2d6f6c14daf9.bb
index 91a03fc..6783894 100644
--- a/recipes-core/cacao/cacao_2d6f6c14daf9.bb
+++ b/recipes-core/cacao/cacao_2d6f6c14daf9.bb
@@ -64,3 +64,5 @@ FILES_${PN}-dbg += "${bindir}/.debug
${libdir}/.debug/lib*.so*"
FILES_${PN}-doc += "${datadir}/gc"
BBCLASSEXTEND = "native"
+
+COMPATIBLE_MACHINE_aarch64 = "-"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 05/23] jamvm: Do not build for aarch64 targets
Avoids:
| configure: error: aarch64-poky-linux-gnu not supported
| NOTE: The following config.log files may provide further information.
| NOTE:
/workdir/build/tmp/work/aarch64-poky-linux/jamvm/2.0.0-devel+gitAUTOINC+6cef41d859-r0/build/config.log
| ERROR: configure failed
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/jamvm/jamvm_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb
index 1762ade..57f7e64 100644
--- a/recipes-core/jamvm/jamvm_git.bb
+++ b/recipes-core/jamvm/jamvm_git.bb
@@ -15,3 +15,4 @@ SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git \
S = "${WORKDIR}/git"
+COMPATIBLE_MACHINE_aarch64 = "-"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 07/23] javasqlite: Create cc tool to make libtool happy
Libtool has hardcoded cc as the name for the compiler. We make a script
that calls gcc.
Fixes:
| ./libtool --mode=link cc
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include/linux
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/include
-DHAVE_SQLITE2=0 -DHAVE_SQLITE3=1 -DHAVE_SQLITE_FUNCTION_TYPE=0
-DHAVE_SQLITE_OPEN_AUX_FILE=0 -DHAVE_SQLITE_SET_AUTHORIZER=0
-DHAVE_SQLITE_TRACE=0 -DHAVE_SQLITE_COMPILE=0 -DHAVE_SQLITE_PROGRESS_HANDLER=0
-DHAVE_SQLITE3_MALLOC=1 -DHAVE_SQLITE3_PREPARE_V2=1
-DHAVE_SQLITE3_PREPARE16_V2=1 -DHAVE_SQLITE3_BIND_ZEROBLOB=1
-DHAVE_SQLITE3_CLEAR_BINDINGS=1 -DHAVE_SQLITE3_COLUMN_TABLE_NAME16=0
-DHAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 -DHAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0
-DHAVE_SQLITE3_BIND_PARAMETER_COUNT=1 -DHAVE_SQLITE3_BIND_PARAMETER_NAME=1
-DHAVE_SQLITE3_BIND_PARAMETER_INDEX=1 -DHAVE_SQLITE3_RESULT_ZEROBLO
B=1 -DHAVE_SQLITE3_INCRBLOBIO=1 -DHAVE_SQLITE3_KEY=0
-DHAVE_SQLITE3_SHARED_CACHE=1 -DHAVE_SQLITE3_OPEN_V2=1
-DHAVE_SQLITE3_LOAD_EXTENSION=0 -DHAVE_SQLITE3_BACKUPAPI=1
-DHAVE_SQLITE3_PROFILE=1 -DHAVE_SQLITE3_STATUS=1 -DHAVE_SQLITE3_DB_STATUS=1
-DHAVE_SQLITE3_STMT_STATUS=1 -DCANT_PASS_VALIST_AS_CHARPTR=1
-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DLL=1 -o native/mkconst
native/mkconst.c
| libtool: link: cc
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include/linux
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/include
-DHAVE_SQLITE2=0 -DHAVE_SQLITE3=1 -DHAVE_SQLITE_FUNCTION_TYPE=0
-DHAVE_SQLITE_OPEN_AUX_FILE=0 -DHAVE_SQLITE_SET_AUTHORIZER=0
-DHAVE_SQLITE_TRACE=0 -DHAVE_SQLITE_COMPILE=0 -DHAVE_SQLITE_PROGRESS_HANDLER=0
-DHAVE_SQLITE3_MALLOC=1 -DHAVE_SQLITE3_PREPARE_V2=1
-DHAVE_SQLITE3_PREPARE16_V2=1 -DHAVE_SQLITE3_BIND_ZEROBLOB=1
-DHAVE_SQLITE3_CLEAR_BINDINGS=1 -DHAVE_SQLITE3_COLUMN_TABLE_NAME16=0
-DHAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 -DHAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0
-DHAVE_SQLITE3_BIND_PARAMETER_COUNT=1 -DHAVE_SQLITE3_BIND_PARAMETER_NAME=1
-DHAVE_SQLITE3_BIND_PARAMETER_INDEX=1 -DHAVE_SQLITE3_RESULT_ZEROBLOB=1 -DHA
VE_SQLITE3_INCRBLOBIO=1 -DHAVE_SQLITE3_KEY=0 -DHAVE_SQLITE3_SHARED_CACHE=1
-DHAVE_SQLITE3_OPEN_V2=1 -DHAVE_SQLITE3_LOAD_EXTENSION=0
-DHAVE_SQLITE3_BACKUPAPI=1 -DHAVE_SQLITE3_PROFILE=1 -DHAVE_SQLITE3_STATUS=1
-DHAVE_SQLITE3_DB_STATUS=1 -DHAVE_SQLITE3_STMT_STATUS=1
-DCANT_PASS_VALIST_AS_CHARPTR=1 -DSQLITE_ENABLE_COLUMN_METADATA=1
-DSQLITE_DLL=1 -o native/mkconst native/mkconst.c
| ./libtool: line 1720: cc: command not found
| make: *** [Makefile:222: native/mkconst] Error 127
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/javasqlite/javasqlite_20150419.bb | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/recipes-core/javasqlite/javasqlite_20150419.bb
b/recipes-core/javasqlite/javasqlite_20150419.bb
index d721d66..06fbac2 100644
--- a/recipes-core/javasqlite/javasqlite_20150419.bb
+++ b/recipes-core/javasqlite/javasqlite_20150419.bb
@@ -7,7 +7,7 @@ That API is wrapped by methods in the SQLite.Database class."
LICENSE = "BSD"
SECTION = "application"
-PR = "r0"
+PR = "r1"
SRC_URI = " \
http://www.ch-werner.de/javasqlite/${BPN}-${PV}.tar.gz \
file://0001-fix-errors-during-cross-compile.patch \
@@ -40,3 +40,9 @@ INSANE_SKIP_${PN}-dev = "dev-elf"
do_configure_append (){
cp ${S}/*-libtool ${S}/libtool
}
+
+do_compile_prepend (){
+ echo '#!/bin/sh' > ${STAGING_BINDIR_NATIVE}/cc
+ echo '${BUILD_CC} $@' >> ${STAGING_BINDIR_NATIVE}/cc
+ chmod a+x ${STAGING_BINDIR_NATIVE}/cc
+}
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 03/23] openjdk8: Make kerberos optional through PACKAGECONFIG
It triggers a lot of dependencies, and it is no clear that
is needed.
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/openjdk/openjdk-8-cross.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc
b/recipes-core/openjdk/openjdk-8-cross.inc
index d04b0d3..7552930 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -3,7 +3,7 @@ JRE_HOME = "${libdir_jvm}/openjre-8"
DEPENDS = "\
openjdk-8-native zip-native ant-native libxslt \
-krb5 libffi fontconfig freetype \
+libffi fontconfig freetype \
"
PRIVATE_LIBS = "\
@@ -40,6 +40,8 @@ PACKAGECONFIG[shark] =
"--with-jvm-variants=zeroshark,,llvm3.5,"
PACKAGECONFIG[repack] = ",,,"
+PACKAGECONFIG[kerberos] = ",,krb5"
+
CACHED_CONFIGUREVARS = " \
${@bb.utils.contains('DISTRO_FEATURES', 'x11',
'ac_x_includes=${STAGING_INCDIR}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11',
'ac_x_libraries=${STAGING_LIBDIR}', '', d)} \
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 02/23] openjdk7: Make kerberos optional through PACKAGECONFIG
It triggers a lot of dependencies, and it is no clear that is needed. Signed-off-by: Ricardo Ribalda Delgado --- recipes-core/openjdk/openjdk-7-common.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index 794bf58..9d2dd8f 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc @@ -67,7 +67,7 @@ DEPENDS = " \ jpeg libpng giflib \ gtk+ glib-2.0 \ cups fontconfig \ -rhino krb5 \ +rhino \ libxt libxinerama libxrender libxtst libxi \ freetype alsa-lib libffi \ attr \ @@ -97,6 +97,8 @@ export CACAO_CONFIGURE_ARGS = " \ JAVA_HOME[unexport] = "1" +PACKAGECONFIG[kerberos] = "--enable-system-kerberos,--disable-system-kerberos,krb5" + EXTRA_OECONF = " \ --enable-downloading=no \ \ -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 00/23] Multiple patches for multiconfig
Patches to build meta-java with multiconfig and aarch64. v2 and v3 have been reviewed at https://github.com/ribalda/meta-java/tree/v2 https://github.com/ribalda/meta-java/tree/v3 Richard, thanks for your patience :) Ricardo Ribalda Delgado (23): icedtea7: Add missing DEPENDS openjdk7: Make kerberos optional through PACKAGECONFIG openjdk8: Make kerberos optional through PACKAGECONFIG classpath: Fix build with targets aarch64 jamvm: Do not build for aarch64 targets cacao: Do not build for aarch64 targets javasqlite: Create cc tool to make libtool happy jdon: Fix location of S rxtx: Fix path of javac jamvm: Fix binary name for javac cup: Do not use all as PACKAGE_ARCH dbus-java: Do not use all as PACKAGE_ARCH rhino: Do not use all as PACKAGE_ARCH ca-certificates: Cannot be an allarch package xalan-j: Do not use all as PACKAGE_ARCH xom: Do not use all as PACKAGE_ARCH jaxen: Do not build an all PACKAGE_ARCH jlex: Do not build as an all PACKAGE_ARCH bsf: Do not build as all PACKAGE_ARCH poi: Do not build as all PACKAGE_ARCH xom: Allow re-running do_compile jdom: Do not use all as PACKAGE_ARCH dom4j: Do not use all as PACKAGE_ARCH .../ca-certificates-java_20180516.bb | 2 +- recipes-core/cacao/cacao_2d6f6c14daf9.bb | 2 ++ .../classpath/classpath-0.99/aarch64.patch| 19 +++ recipes-core/classpath/classpath_0.99.bb | 1 + recipes-core/cup/cup_0.10k.bb | 1 + recipes-core/icedtea/icedtea7-native.inc | 3 ++- recipes-core/jakarta-libs/bsf_2.4.0.bb| 4 +++- recipes-core/jakarta-libs/poi_3.0.bb | 2 ++ recipes-core/jamvm/jamvm.inc | 5 +++- recipes-core/jamvm/jamvm_git.bb | 1 + .../javasqlite/javasqlite_20150419.bb | 8 ++- recipes-core/jlex/jlex_1.2.6.bb | 2 ++ recipes-core/openjdk/openjdk-7-common.inc | 4 +++- recipes-core/openjdk/openjdk-8-cross.inc | 4 +++- recipes-core/rhino/rhino_1.7r4.bb | 2 ++ recipes-core/xalan-j/xalan-j_2.7.1.bb | 4 +++- recipes-core/xml-commons/dom4j_1.6.1.bb | 1 + recipes-core/xml-commons/jaxen_1.1.6.bb | 2 ++ recipes-core/xml-commons/jdom_1.1.3.bb| 4 recipes-core/xml-commons/xom_1.2.10.bb| 14 +-- recipes-extended/dbus/dbus-java_2.7.bb| 5 +++- recipes-extended/rxtx/files/javapath.patch| 23 +++ recipes-extended/rxtx/rxtx_2.2.0.bb | 5 ++-- 23 files changed, 105 insertions(+), 13 deletions(-) create mode 100644 recipes-core/classpath/classpath-0.99/aarch64.patch create mode 100644 recipes-extended/rxtx/files/javapath.patch -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v4 01/23] icedtea7: Add missing DEPENDS
Fixes: | checking X11/X.h usability... no | checking X11/X.h presence... no | checking for X11/X.h... no | configure: error: "xorg headers were not found - | try installing xorg-x11-proto-devel." | NOTE: The following config.log files may provide further information. | NOTE: /workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/config.log | ERROR: configure failed | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_configure (log file is located at /workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/temp/log.do_configure.29594) ERROR: Task (/workdir/repo/poky/../meta-java/recipes-core/icedtea/icedtea7-native_2.1.3.bb:do_configure) failed with exit code '1' Suggested-by: Jacob Kroon Signed-off-by: Ricardo Ribalda Delgado --- recipes-core/icedtea/icedtea7-native.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index 70b935a..b578cb2 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -8,7 +8,8 @@ DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ giflib-native jpeg-native libpng-native \ glib-2.0-native freetype-native zlib-native \ fontconfig-native zip-native \ - unzip-native make-native util-linux-native\ + unzip-native make-native util-linux-native \ + xorgproto-native libx11-native \ " PACKAGECONFIG ??= "" -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 02/23] openjd7: remove support for kerberos
Hi Richard
On Tue, Jun 25, 2019 at 11:41 AM Richard Leitner
wrote:
>
> Hi Ricardo,
> thanks for the patches!
>
> On 25/06/2019 09:52, Ricardo Ribalda Delgado wrote:
> > It triggers a lot of dependencies, and it is no clear that
> > is needed.
>
> To be honest I don't know if it's needed or used by anybody, but would
> it be possible to create a PACKAGECONFIG for de-/selecting the
> system-kerberos?
Sure,
I am working at:
https://github.com/ribalda/meta-java/tree/v2
Do you prefer that I resend the patches after all the feedback is
fixed or you rather pull directly from there?
So far I have fix
- x11 native
-packageconfig for kerberos openjdk8 and openjdk7
>
> Furthermore if you send a v2 can you please fix the subject (openjd7 ->
> openjdk7)?
>
> Same goes for openjdk-8.
>
> Thanks & regards;Richard.L
>
> >
> > Signed-off-by: Ricardo Ribalda Delgado
> > ---
> > recipes-core/openjdk/openjdk-7-common.inc | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/recipes-core/openjdk/openjdk-7-common.inc
> > b/recipes-core/openjdk/openjdk-7-common.inc
> > index 794bf58..26e71ce 100644
> > --- a/recipes-core/openjdk/openjdk-7-common.inc
> > +++ b/recipes-core/openjdk/openjdk-7-common.inc
> > @@ -67,7 +67,7 @@ DEPENDS = " \
> > jpeg libpng giflib \
> > gtk+ glib-2.0 \
> > cups fontconfig \
> > -rhino krb5 \
> > +rhino \
> > libxt libxinerama libxrender libxtst libxi \
> > freetype alsa-lib libffi \
> > attr \
> > @@ -134,6 +134,7 @@ EXTRA_OECONF = " \
> > EXTRA_OECONF += " \
> > --disable-system-pcsc \
> > --disable-system-sctp \
> > +--disable-system-kerberos \
> > "
> >
> > do_configure_prepend() {
> >
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Ricardo Ribalda
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 01/23] icedtea7: Add x11 as default pkgconfig
Hi
On Tue, Jun 25, 2019 at 11:04 AM Jacob Kroon wrote:
>
> Hi Ricardo,
>
> FYI, I notice that we have gone off-list.
Sorry, not on purpose :S
Will try also with that
thanks
>
> You probably need to add more dependencies as you iterate the builds.
>
> It looks like "libx11-native" is missing now.
>
> /Jacob
>
> On 6/25/19 10:57 AM, Ricardo Ribalda Delgado wrote:
> > Hi Jacob
> >
> > Unfortunately it crashes at do_compile: :(
> >
> > build-boot/tmp/sun/sun.awt/awt/obj64/Disposer.o
> > ../../../src/share/native/sun/awt/../java2d/Disposer.c
> > | In file included from
> > ../../../src/share/native/sun/awt/../java2d/pipe/Region.h:34:0,
> > | from
> > ../../../src/share/native/sun/awt/../java2d/pipe/Region.c:30:
> > | ../../../src/solaris/native/sun/awt/utility/rect.h:31:22: fatal
> > error: X11/Xlib.h: No such file or directory
> > | #include
> > | ^
> > | compilation terminated.
> > | make[6]: ***
> > [/workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk-boot/jdk/make/common/internal/NativeCompileRules.gmk:75:
> > /workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build-boot/tmp/sun/sun.awt/awt/obj64/Region.o]
> > Error 1
> > | make[6]: *** Waiting for unfinished jobs
> >
> > So the initial proposal stays. Unless you want to fix it :P
> >
> > Cheers!
> >
> > On Tue, Jun 25, 2019 at 10:44 AM Ricardo Ribalda Delgado
> > wrote:
> >>
> >> Hi Jacob
> >>
> >>
> >> On Tue, Jun 25, 2019 at 10:35 AM Jacob Kroon
> >> wrote:
> >>>
> >>> Hi Ricardo,
> >>>
> >>> On 6/25/19 9:52 AM, Ricardo Ribalda Delgado wrote:
> >>>> Seems to be a basic dependency, not optional.
> >>>>
> >>>> Fixes:
> >>>> | checking X11/X.h usability... no
> >>>> | checking X11/X.h presence... no
> >>>> | checking for X11/X.h... no
> >>>> | configure: error: "xorg headers were not found -
> >>>> | try installing xorg-x11-proto-devel."
> >>>> | NOTE: The following config.log files may provide further information.
> >>>> | NOTE:
> >>>> /workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/config.log
> >>>> | ERROR: configure failed
> >>>> | WARNING: exit code 1 from a shell command.
> >>>> | ERROR: Function failed: do_configure (log file is located at
> >>>> /workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/temp/log.do_configure.29594)
> >>>> ERROR: Task
> >>>> (/workdir/repo/poky/../meta-java/recipes-core/icedtea/icedtea7-native_2.1.3.bb:do_configure)
> >>>> failed with exit code '1'
> >>>>
> >>>> Signed-off-by: Ricardo Ribalda Delgado
> >>>> ---
> >>>>recipes-core/icedtea/icedtea7-native.inc | 2 +-
> >>>>1 file changed, 1 insertion(+), 1 deletion(-)
> >>>>
> >>>> diff --git a/recipes-core/icedtea/icedtea7-native.inc
> >>>> b/recipes-core/icedtea/icedtea7-native.inc
> >>>> index 69f5d25..747bb72 100644
> >>>> --- a/recipes-core/icedtea/icedtea7-native.inc
> >>>> +++ b/recipes-core/icedtea/icedtea7-native.inc
> >>>> @@ -11,7 +11,7 @@ DEPENDS = "virtual/javac-native virtual/java-native
> >>>> classpath-native \
> >>>> unzip-native make-native util-linux-native\
> >>>> "
> >>>>
> >>>> -PACKAGECONFIG ??= ""
> >>>> +PACKAGECONFIG ??= "x11"
> >>>>PACKAGECONFIG[x11] = ",--disable-headful,libx11-native
> >>>> xorgproto-native libxt-native libxext-native libxrender-native"
> >>>>
> >>>>OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG',
> >>>> 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}"
> >>>>
> >>>
> >>> I have run into this as well; instead of turning on x11 by default,
> >>> wouldn't it be better to add "xorgproto-native" to DEPENDS ? I doubt the
> >>> native build needs x11 support in most cases.
> >>
> >> That is definitely better. I have fixed the patch on
> >> https://github.com/ribalda/meta-java/commit/1f48e7d72ac9eeb45b5d9c872e95e3b32fd74f8d
> >>
> >> I will resend the set when I get more comments
> >>
> >> Thanks!
> >>
> >>>
> >>> /Jacob
> >>>
> >>>
> >>> [mikrodidakt]
> >>> Jacob Kroon • +46 46325040
> >>>
> >>> mikrodidakt.se • Skiffervägen 48, SE-224 78 LUND, Sweden
> >>>
> >>> Consultans since 1980 • SW, HW, Embedded Systems, Linux
> >>>
> >>>
> >>
> >>
> >> --
> >> Ricardo Ribalda
> >
> >
> >
>
>
> [mikrodidakt]
> Jacob Kroon • +46 46325040
>
> mikrodidakt.se • Skiffervägen 48, SE-224 78 LUND, Sweden
>
> Consultans since 1980 • SW, HW, Embedded Systems, Linux
>
>
--
Ricardo Ribalda
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 17/23] jaxen: Do not build an all PACKAGE_ARCH
jaxen depends on non -native recipes and breaks multiconfig.
Fixes:
| 138 problems (138 warnings)rm: cannot remove 'build/org/jdom/input':
Directory not empty
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_compile (log file is located at
/workdir/build/tmp/work/all-poky-linux/jaxen/1.1.6-r0/temp/log.do_compile.21778)
NOTE: recipe jaxen-1.1.6-r0: task do_compile: Failed
ERROR: Task
(multiconfig:inteli7:/workdir/repo/poky/../meta-java/recipes-core/xml-commons/jaxen_1.1.6.bb:do_compile)
failed with exit code '1'
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xml-commons/jaxen_1.1.6.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/xml-commons/jaxen_1.1.6.bb
b/recipes-core/xml-commons/jaxen_1.1.6.bb
index d75ce75..2741f2c 100644
--- a/recipes-core/xml-commons/jaxen_1.1.6.bb
+++ b/recipes-core/xml-commons/jaxen_1.1.6.bb
@@ -23,6 +23,8 @@ SRC_URI[jdom.sha256sum] =
"a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d
S = "${WORKDIR}/git/jaxen"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
do_compile() {
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 22/23] jdom: Do not use all as PACKAGE_ARCH
It DEPENDS on packages that are not -native.
Fixes:
ERROR: mc:qt5506:jdom-1.1.3-r0 do_package: Package already staged
(/workdir/build/tmp/sstate-control/manifest-allarch-jdom.package)?!
ERROR: mc:qt5506:jdom-1.1.3-r0 do_package:
ERROR: mc:qt5506:jdom-1.1.3-r0 do_package: Function failed: sstate_task_postfunc
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/temp/log.do_package.5632
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xml-commons/jdom_1.1.3.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/xml-commons/jdom_1.1.3.bb
b/recipes-core/xml-commons/jdom_1.1.3.bb
index 8073819..df9125d 100644
--- a/recipes-core/xml-commons/jdom_1.1.3.bb
+++ b/recipes-core/xml-commons/jdom_1.1.3.bb
@@ -12,6 +12,8 @@ SRC_URI =
"http://www.jdom.org/dist/source/archive/jdom-${PV}.tar.gz;
SRC_URI[md5sum] = "dc8391e84cfdb170fcd8279aa370019f"
SRC_URI[sha256sum] =
"d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47bd8d1f"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
S = "${WORKDIR}/${PN}"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 23/23] dom4j: Do not use all as PACKAGE_ARCH
It has DEPENDS that are not -native
Fixes:
ERROR: mc:qt5506:dom4j-1.6.1-r0 do_packagedata: Error executing a python
function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:sstate_task_postfunc(d)
0003:
File: '/workdir/repo/poky/meta/classes/sstate.bbclass', lineno: 739, function:
sstate_task_postfunc
0735:
0736:sstateinst = d.getVar("SSTATE_INSTDIR")
0737:d.setVar('SSTATE_FIXMEDIR', shared_state['fixmedir'])
0738:
*** 0739:sstate_installpkgdir(shared_state, d)
0740:
0741:bb.utils.remove(d.getVar("SSTATE_BUILDDIR"), recurse=True)
0742:}
0743:sstate_task_postfunc[dirs] = "${WORKDIR}"
File: '/workdir/repo/poky/meta/classes/sstate.bbclass', lineno: 379, function:
sstate_installpkgdir
0375:oe.path.remove(dir)
0376:
0377:for state in ss['dirs']:
0378:prepdir(state[1])
*** 0379:os.rename(sstateinst + state[0], state[1])
0380:sstate_install(ss, d)
0381:
0382:for plain in ss['plaindirs']:
0383:workdir = d.getVar('WORKDIR')
Exception: FileNotFoundError: [Errno 2] No such file or directory:
'/workdir/build/tmp/work/all-poky-linux/dom4j/1.6.1-r0/sstate-build-packagedata/pkgdata'
->
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xml-commons/dom4j_1.6.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-core/xml-commons/dom4j_1.6.1.bb
b/recipes-core/xml-commons/dom4j_1.6.1.bb
index 97c9947..ee46dfd 100644
--- a/recipes-core/xml-commons/dom4j_1.6.1.bb
+++ b/recipes-core/xml-commons/dom4j_1.6.1.bb
@@ -18,6 +18,7 @@ SRC_URI[archive.sha256sum] =
"01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e192
SRC_URI[jaxme.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4"
SRC_URI[jaxme.sha256sum] =
"0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
inherit java-library
do_compile() {
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 21/23] 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
---
recipes-core/xml-commons/xom_1.2.10.bb | 7 +--
1 file changed, 5 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..621a5e1 100644
--- a/recipes-core/xml-commons/xom_1.2.10.bb
+++ b/recipes-core/xml-commons/xom_1.2.10.bb
@@ -34,8 +34,11 @@ do_compile() {
oe_makeclasspath cp -s xercesImpl xalan2
cp=build:$cp
-mv ${WORKDIR}/git/jaxen ${WORKDIR}/jaxen-${PV_jaxen}
-rm -rf ${WORKDIR}/git
+if [ -d ${WORKDIR}/git ] ; then
+mv ${WORKDIR}/git/jaxen ${WORKDIR}/jaxen-${PV_jaxen}
+rm -rf ${WORKDIR}/git
+fi
+
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*" \)`
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 18/23] jlex: Do not build as an all PACKAGE_ARCH
jlex RDEPENDS on non -all package and breaks multiconfig.
Fixes:
ERROR: mc:qt5506:jlex-1.2.6-r0 do_package_write_deb: Fatal errors occurred in
subprocesses:
Command
'PATH="/workdir/build/tmp/sysroots-uninative/x86_64-linux/usr/bin:/workdir/repo/poky/scripts:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/usr/bin/allarch-poky-linux:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot/usr/bin/crossscripts:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/usr/sbin:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/usr/bin:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/sbin:/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/recipe-sysroot-native/bin:/workdir/repo/poky/bitbake/bin:/workdir/build/tmp/hosttools"
dpkg-deb -b
/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/packages-split/jlex
/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/deploy-debs/all' returned
non-zero exit status 2
Subprocess output:dpkg-deb: building package 'jlex' in
'/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/deploy-debs/all'.
dpkg-deb: error: unable to create
'/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/deploy-debs/all': No such
file or directory
ERROR: mc:qt5506:jlex-1.2.6-r0 do_package_write_deb:
ERROR: mc:qt5506:jlex-1.2.6-r0 do_package_write_deb: Function failed:
do_package_deb
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/jlex/1.2.6-r0/temp/log.do_package_write_deb.1491
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/jlex/jlex_1.2.6.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/jlex/jlex_1.2.6.bb b/recipes-core/jlex/jlex_1.2.6.bb
index 45d76ed..b8f9ffb 100644
--- a/recipes-core/jlex/jlex_1.2.6.bb
+++ b/recipes-core/jlex/jlex_1.2.6.bb
@@ -3,6 +3,8 @@ AUTHOR = "Elliot Berk, A. Appel, C. Scott Ananian"
LICENSE = "JLEX"
LIC_FILES_CHKSUM =
"file://Main.java;beginline=148;endline=166;md5=9bf4a6a951053991db64f9d7330d648a"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
RDEPENDS_${PN} = "java2-runtime"
RDEPENDS_${PN}_class-native = ""
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 20/23] poi: Do not build as all PACKAGE_ARCH
poi DEPENDS on non -native packages, which breaks multiconfig.
Fixes:
ERROR: mc:inteli7:poi-3.0-r0 do_packagedata: Command 'cd
/workdir/build/tmp/work/all-poky-linux/poi/3.0-r0/pkgdata; find . -type d
-print | tar --xattrs --xattrs-include='*' -cf - -S -C
/workdir/build/tmp/work/all-poky-linux/poi/3.0-r0/pkgdata -p --no-recursion
--files-from - | tar --xattrs --xattrs-include='*' -xhf - -C
/workdir/build/tmp/pkgdata/inteli7' returned non-zero exit status 2
ERROR: mc:inteli7:poi-3.0-r0 do_packagedata: Function failed:
sstate_task_postfunc
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/poi/3.0-r0/temp/log.do_packagedata.27730
NOTE: recipe poi-3.0-r0: task do_packagedata: Failed
ERROR: Task
(multiconfig:inteli7:/workdir/repo/poky/../meta-java/recipes-core/jakarta-libs/poi_3.0.bb:do_packagedata)
failed with exit code '1'
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/jakarta-libs/poi_3.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/jakarta-libs/poi_3.0.bb
b/recipes-core/jakarta-libs/poi_3.0.bb
index f9178f2..e33f2f2 100644
--- a/recipes-core/jakarta-libs/poi_3.0.bb
+++ b/recipes-core/jakarta-libs/poi_3.0.bb
@@ -7,6 +7,8 @@ SRC_URI =
"http://archive.apache.org/dist/jakarta/poi/release/src/${BPN}-src-${P
S = "${WORKDIR}/${BPN}-3.0-rc4"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
DEPENDS = "fastjar-native commons-collections3 commons-logging commons-lang
commons-beanutils log4j1.2 xalan-j"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 19/23] bsf: Do not build as all PACKAGE_ARCH
The package DEPENDS on non -native package, which breaks multiconfig.
Fixes:
NOTE: recipe bsf-2.4.0-r1: task do_package: Succeeded
ERROR: mc:qt5507:bsf-2.4.0-r1 do_package: Error executing a python function in
exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:populate_packages(d)
0003:
File: '/workdir/repo/poky/meta/classes/package.bbclass', lineno: 1237,
function: populate_packages
1233:
1234:mkdir_recurse(dvar, root, os.path.dirname(file))
1235:fpath = os.path.join(root,file)
1236:if not cpath.islink(file):
*** 1237:os.link(file, fpath)
1238:continue
1239:ret = bb.utils.copyfile(file, fpath)
1240:if ret is False or ret == 0:
1241:bb.fatal("File population failed")
Exception: FileExistsError: [Errno 17] File exists:
'./usr/share/java/bsf-2.4.0.jar' ->
'/workdir/build/tmp/work/all-poky-linux/bsf/2.4.0-r1/packages-split/libbsf-java/./usr/share/java/bsf-2.4.0.jar'
ERROR: mc:qt5507:bsf-2.4.0-r1 do_package: [Errno 17] File exists:
'./usr/share/java/bsf-2.4.0.jar' ->
'/workdir/build/tmp/work/all-poky-linux/bsf/2.4.0-r1/packages-split/libbsf-java/./usr/share/java/bsf-2.4.0.jar'
ERROR: mc:qt5507:bsf-2.4.0-r1 do_package: Function failed: populate_packages
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/bsf/2.4.0-r1/temp/log.do_package.12673
NOTE: recipe bsf-2.4.0-r1: task do_package: Failed
ERROR: Task
(multiconfig:qt5507:/workdir/repo/poky/../meta-java/recipes-core/jakarta-libs/bsf_2.4.0.bb:do_package)
failed with exit code '1'
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/jakarta-libs/bsf_2.4.0.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-core/jakarta-libs/bsf_2.4.0.bb
b/recipes-core/jakarta-libs/bsf_2.4.0.bb
index 1037396..e1cb34f 100644
--- a/recipes-core/jakarta-libs/bsf_2.4.0.bb
+++ b/recipes-core/jakarta-libs/bsf_2.4.0.bb
@@ -1,11 +1,13 @@
SUMMARY = "Bean Scripting Framework package"
AUTHOR = "Apache Software Foundation"
LICENSE = "Apache-2.0"
-PR = "r1"
+PE = "1"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3"
SRC_URI =
"http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-${PV}.tar.gz;
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
DEPENDS = "jacl commons-logging rhino xalan-j bcel"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 11/23] cup: Do not use all as PACKAGE_ARCH
cup has RDEPEND that are not PACKAGE_ARCH=all
Fixes:
ERROR: mc:qt5022:cup-0.10k-r0 do_package_write_deb_setscene: Error executing a
python function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:do_package_write_deb_setscene(d)
0003:
File: '/workdir/repo/poky/meta/classes/package_deb.bbclass', lineno: 296,
function: do_package_write_deb_setscene
0292:
0293:if os.access(os.path.join(tmpdir, "stamps",
"DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
0294:os.unlink(os.path.join(tmpdir, "stamps",
"DEB_PACKAGE_INDEX_CLEAN"))
0295:
*** 0296:sstate_setscene(d)
0297:}
0298:addtask do_package_write_deb_setscene
0299:
0300:python () {
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/cup/cup_0.10k.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-core/cup/cup_0.10k.bb b/recipes-core/cup/cup_0.10k.bb
index 7792c62..3ce5a21 100644
--- a/recipes-core/cup/cup_0.10k.bb
+++ b/recipes-core/cup/cup_0.10k.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM =
"file://${WORKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c
RDEPENDS_${PN} = "java2-runtime"
RDEPENDS_${PN}_class-native = ""
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
inherit java-library
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 16/23] xom: Do not use all as PACKAGE_ARCH
It RDEPENDS on packages that ar not PACKAGE_ARCH=all
Fixes:
ERROR: mc:qt5507:xom-1.2.10-r0 do_compile: Function failed: do_compile (log
file is located at
/workdir/build/tmp/work/all-poky-linux/xom/1.2.10-r0/temp/log.do_compile.3256)
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/xom/1.2.10-r0/temp/log.do_compile.3256
Log data follows:
| DEBUG: Executing shell function do_compile
| mv: cannot stat
'/workdir/build/tmp/work/all-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/all-poky-linux/xom/1.2.10-r0/temp/log.do_compile.3256)
NOTE: recipe xom-1.2.10-r0: task do_compile: Failed
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xml-commons/xom_1.2.10.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/xml-commons/xom_1.2.10.bb
b/recipes-core/xml-commons/xom_1.2.10.bb
index 0e923d4..8755ddc 100644
--- a/recipes-core/xml-commons/xom_1.2.10.bb
+++ b/recipes-core/xml-commons/xom_1.2.10.bb
@@ -22,6 +22,8 @@ SRC_URI[archive.sha256sum] =
"39985c2debb8044005fd07b09cb06f10e75652b3c048c9b443
S = "${WORKDIR}/XOM"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
DEPENDS = "fastjar-native virtual/javac-native xerces-j xalan-j"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 14/23] ca-certificates: Cannot be an allarch package
It RDEPENDS on PACKAGE_ARCH!=all packages
Signed-off-by: Ricardo Ribalda Delgado
---
.../ca-certificates-java/ca-certificates-java_20180516.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
index 2db1915..feaa7dc 100644
--- a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
+++ b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
@@ -24,7 +24,7 @@ SRC_URI = "\
SRCREV = "793b846dcd4e79371bbe8069e4125ec2fd462e57"
-inherit java allarch
+inherit java
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 13/23] rhino: Do not use all as PACKAGE_ARCH
rhino has RDEPEND that are not PACKAGE_ARCH=all
Fixes:
ERROR: mc:inteli7:rhino-1.7r4-r0 do_package_write_deb_setscene: Error executing
a python function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:do_package_write_deb_setscene(d)
0003:
File: '/workdir/repo/poky/meta/classes/package_deb.bbclass', lineno: 296,
function: do_package_write_deb_setscene
0292:
0293:if os.access(os.path.join(tmpdir, "stamps",
"DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
0294:os.unlink(os.path.join(tmpdir, "stamps",
"DEB_PACKAGE_INDEX_CLEAN"))
0295:
*** 0296:sstate_setscene(d)
0297:}
0298:addtask do_package_write_deb_setscene
0299:
0300:python () {
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/rhino/rhino_1.7r4.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/rhino/rhino_1.7r4.bb
b/recipes-core/rhino/rhino_1.7r4.bb
index 0a84473..4242005 100644
--- a/recipes-core/rhino/rhino_1.7r4.bb
+++ b/recipes-core/rhino/rhino_1.7r4.bb
@@ -6,6 +6,8 @@ DEPENDS_class-native += "classpath-native"
BBCLASSEXTEND = "native"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
SRC_URI = "\
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 12/23] dbus-java: Do not use all as PACKAGE_ARCH
dbus-java has RDEPEND that are not PACKAGE_ARCH=all
Fixes:
ERROR: dbus-java-2.7-r0 do_populate_sysroot_setscene: Error executing a python
function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:do_populate_sysroot_setscene(d)
0003:
File: '/workdir/repo/poky/meta/classes/staging.bbclass', lineno: 126, function:
do_populate_sysroot_setscene
0122:do_populate_sysroot[sstate-outputdirs] =
"${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
0123:do_populate_sysroot[sstate-fixmedir] =
"${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
0124:
0125:python do_populate_sysroot_setscene () {
*** 0126:sstate_setscene(d)
0127:}
0128:addtask do_populate_sysroot_setscene
0129:
0130:def staging_copyfile(c, target, dest, postinsts, seendirs):
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-extended/dbus/dbus-java_2.7.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-extended/dbus/dbus-java_2.7.bb
b/recipes-extended/dbus/dbus-java_2.7.bb
index 0b093a0..7715325 100644
--- a/recipes-extended/dbus/dbus-java_2.7.bb
+++ b/recipes-extended/dbus/dbus-java_2.7.bb
@@ -11,7 +11,9 @@ RDEPENDS_${PN}-viewer = "java2-runtime libunixsocket-java
${PN}-bin libmatthew-d
RDEPENDS_${PN}-bin = "java2-runtime libunixsocket-java libmatthew-debug-java
${JPN}"
RSUGGESTS_${JPN} = "libunixsocket-java"
-PR = "r0"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
+PE = "1"
LIC_FILES_CHKSUM = "file://COPYING;md5=72cc739fb93ae32741edbae802490e92"
SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz;
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 10/23] jamvm: Fix binary location for ecj-initial
| /bin/bash:
/workdir/build/tmp/work/dbfp4-poky-linux/jamvm/2.0.0-devel+gitAUTOINC+6cef41d859-r0/recipe-sysroot-native/usr/bin/ecj-initial:
No such file or directory
| Makefile:663: recipe for target 'classes.zip' failed
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/jamvm/jamvm.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc
index fc21380..85b7aaa 100644
--- a/recipes-core/jamvm/jamvm.inc
+++ b/recipes-core/jamvm/jamvm.inc
@@ -35,7 +35,7 @@ EXTRA_OECONF = "--with-classpath-install-dir=${prefix}
--libdir=${libdir}/jamvm
CFLAGS_append_class-native = " -DDEFAULT_MAX_HEAP=1024*MB"
# Enforce usage of ecj-initial.
-EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \
+EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-bootstrap \
GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \
"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 15/23] xalan-j: Do not use all as PACKAGE_ARCH
It has DEPENDS that are not -native.
Fixes:
ERROR: mc:inteli7:xalan-j-2.7.1-r1 do_package: Error executing a python
function in exec_python_func() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function:
0001:
*** 0002:emit_pkgdata(d)
0003:
File: '/workdir/repo/poky/meta/classes/package.bbclass', lineno: 1502,
function: emit_pkgdata
1498:allow_empty = d.getVar('ALLOW_EMPTY_%s' % pkg)
1499:if not allow_empty:
1500:allow_empty = d.getVar('ALLOW_EMPTY')
1501:root = "%s/%s" % (pkgdest, pkg)
*** 1502:os.chdir(root)
1503:g = glob('*')
1504:if g or allow_empty == "1":
1505:# Symlinks needed for reverse lookups (from the final
package name)
1506:subdata_sym = pkgdatadir + "/runtime-reverse/%s" % pkgval
Exception: FileNotFoundError: [Errno 2] No such file or directory:
'/workdir/build/tmp/work/all-poky-linux/xalan-j/2.7.1-r1/packages-split/xalan-j-src'
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xalan-j/xalan-j_2.7.1.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-core/xalan-j/xalan-j_2.7.1.bb
b/recipes-core/xalan-j/xalan-j_2.7.1.bb
index 7c68fba..922e293 100644
--- a/recipes-core/xalan-j/xalan-j_2.7.1.bb
+++ b/recipes-core/xalan-j/xalan-j_2.7.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
AUTHOR = "Apache Software Foundation"
HOMEPAGE = "http://xml.apache.org/xalan-j;
-PR = "r1"
+PE = "1"
DEPENDS = "xerces-j regexp jlex cup jaxp1.3 bcel"
@@ -18,6 +18,8 @@ SRC_URI = "\
S = "${WORKDIR}/${BPN}_2_7_1"
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
inherit java-library
JPN = "libxalan2-java"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 09/23] rxtx: Fix path of javac
rxtx was wrongly using the patch from cacao sysroot. Fixes: | /bin/bash: /workdir/build/tmp/work/x86_64-linux/cacao-native/1.6.1-r0/recipe-sysroot-native/usr/bin/javac: No such file or directory | Makefile:834: recipe for target '/workdir/build/tmp/work/dbfp4-poky-linux/rxtx/2.2.0-r2/rxtx-2.2pre2/gnu/io/UnsupportedCommOperationException.class' failed | make: *** [/workdir/build/tmp/work/dbfp4-poky-linux/rxtx/2.2.0-r2/rxtx-2.2pre2/gnu/io/UnsupportedCommOperationException.class] Error 127 | make: *** Waiting for unfinished jobs Signed-off-by: Ricardo Ribalda Signed-off-by: Ricardo Ribalda Delgado --- recipes-extended/rxtx/files/javapath.patch | 23 ++ recipes-extended/rxtx/rxtx_2.2.0.bb| 5 +++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 recipes-extended/rxtx/files/javapath.patch diff --git a/recipes-extended/rxtx/files/javapath.patch b/recipes-extended/rxtx/files/javapath.patch new file mode 100644 index 000..e0c1737 --- /dev/null +++ b/recipes-extended/rxtx/files/javapath.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate + +Signed-off-by: Ricardo Ribalda + +diff --git a/configure.in b/configure.in +index 1778a52..344f5ac 100644 +--- a/configure.in b/configure.in +@@ -484,10 +484,10 @@ if test "$CC" = "gcc" || test "$CC"="egcs"; then + ;; + *) + find_java_native_include jni_md.h +- JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST) -jni" +- JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3" +- JAR="\$(JPATH)/bin/jar" +- JAVADOC="\$(JPATH)/bin/javadoc" ++ JAVAH="gjavah -classpath \$(CLASSPATH) -d \$(DEST) -jni" ++ JAVAC="javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3" ++ JAR="fastjar" ++ JAVADOC="javadoc" + CFLAGS=$CFLAGS" -D_BSD_SOURCE" + ;; + esac diff --git a/recipes-extended/rxtx/rxtx_2.2.0.bb b/recipes-extended/rxtx/rxtx_2.2.0.bb index d4fbb9d..8216e26 100644 --- a/recipes-extended/rxtx/rxtx_2.2.0.bb +++ b/recipes-extended/rxtx/rxtx_2.2.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Full Java CommAPI implementation" DEPENDS = "virtual/javac-native" LICENSE = "RXTXv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=32303a23463f90b12a7d1dafb8deabf4" -PR = "r2" +PE = "1" SRC_URI = "http://rxtx.qbang.org/pub/rxtx/rxtx-2.2pre2.zip \ file://zsystem_init_exception.patch \ @@ -19,7 +19,8 @@ SRC_URI = "http://rxtx.qbang.org/pub/rxtx/rxtx-2.2pre2.zip \ file://usb_38400.patch \ file://fix_snprintf.patch \ file://format_security.patch \ - file://0001-Support-Freescale-i.MX-serial-ports.patch" + file://0001-Support-Freescale-i.MX-serial-ports.patch\ + file://javapath.patch" SRC_URI[md5sum] = "7eedb18e3f33a427e2b0e9be8ce3f94c" SRC_URI[sha256sum] = "3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03" -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 04/23] classpath: Fix build with targets aarch64
Fixes: | In file included from ../../../classpath-0.99/native/fdlibm/fdlibm.h:36, | from ../../../classpath-0.99/native/fdlibm/e_exp.c:76: | ../../../classpath-0.99/native/fdlibm/ieeefp.h:163:2: error: #error Endianess not declared!! | #error Endianess not declared!! | ^ | In file included from ../../classpath-0.99/native/fdlibm/fdlibm.h:40, Signed-off-by: Ricardo Ribalda Delgado --- .../classpath/classpath-0.99/aarch64.patch| 19 +++ recipes-core/classpath/classpath_0.99.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 recipes-core/classpath/classpath-0.99/aarch64.patch diff --git a/recipes-core/classpath/classpath-0.99/aarch64.patch b/recipes-core/classpath/classpath-0.99/aarch64.patch new file mode 100644 index 000..4de40fb --- /dev/null +++ b/recipes-core/classpath/classpath-0.99/aarch64.patch @@ -0,0 +1,19 @@ +Upstream-Status: Inappropriate [upstream is dead] + +Signed-off-by: Ricardo Ribalda + +diff --git a/native/fdlibm/ieeefp.h b/native/fdlibm/ieeefp.h +index c230bbb..700dd3a 100644 +--- a/native/fdlibm/ieeefp.h b/native/fdlibm/ieeefp.h +@@ -158,6 +158,10 @@ + #define __IEEE_BIG_ENDIAN + #endif + ++#ifdef __aarch64__ ++#define __IEEE_LITTLE_ENDIAN ++#endif ++ + #ifndef __IEEE_BIG_ENDIAN + #ifndef __IEEE_LITTLE_ENDIAN + #error Endianess not declared!! diff --git a/recipes-core/classpath/classpath_0.99.bb b/recipes-core/classpath/classpath_0.99.bb index 6aa3baa..714503a 100644 --- a/recipes-core/classpath/classpath_0.99.bb +++ b/recipes-core/classpath/classpath_0.99.bb @@ -14,6 +14,7 @@ SRC_URI += " \ file://toolwrapper-exithook.patch \ file://use_libdir.patch \ file://freetype2.patch \ +file://aarch64.patch \ " SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 02/23] openjd7: remove support for kerberos
It triggers a lot of dependencies, and it is no clear that
is needed.
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/openjdk/openjdk-7-common.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-core/openjdk/openjdk-7-common.inc
b/recipes-core/openjdk/openjdk-7-common.inc
index 794bf58..26e71ce 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -67,7 +67,7 @@ DEPENDS = " \
jpeg libpng giflib \
gtk+ glib-2.0 \
cups fontconfig \
-rhino krb5 \
+rhino \
libxt libxinerama libxrender libxtst libxi \
freetype alsa-lib libffi \
attr \
@@ -134,6 +134,7 @@ EXTRA_OECONF = " \
EXTRA_OECONF += " \
--disable-system-pcsc \
--disable-system-sctp \
+--disable-system-kerberos \
"
do_configure_prepend() {
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 03/23] openjd8: remove support for kerberos
It triggers a lot of dependencies, and it is no clear that
is needed.
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/openjdk/openjdk-8-cross.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc
b/recipes-core/openjdk/openjdk-8-cross.inc
index d04b0d3..a2bd23e 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -3,7 +3,7 @@ JRE_HOME = "${libdir_jvm}/openjre-8"
DEPENDS = "\
openjdk-8-native zip-native ant-native libxslt \
-krb5 libffi fontconfig freetype \
+libffi fontconfig freetype \
"
PRIVATE_LIBS = "\
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 08/23] jdon: Fix location of S
Otherwise License files cannot be found.
Fixes:
WARNING: jdom-1.1.3-r0 do_populate_lic: Could not copy license file
/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/jdom-1.1.3/LICENSE.txt to
/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/license-destdir/jdom/LICENSE.txt:
[Errno 2] No such file or directory:
'/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/jdom-1.1.3/LICENSE.txt'
ERROR: jdom-1.1.3-r0 do_populate_lic: QA Issue: jdom: LIC_FILES_CHKSUM points
to an invalid file:
/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/jdom-1.1.3/LICENSE.txt
[license-checksum]
ERROR: jdom-1.1.3-r0 do_populate_lic: Fatal QA errors found, failing task.
ERROR: jdom-1.1.3-r0 do_populate_lic:
ERROR: jdom-1.1.3-r0 do_populate_lic: Function failed: populate_lic_qa_checksum
ERROR: Logfile of failure stored in:
/workdir/build/tmp/work/all-poky-linux/jdom/1.1.3-r0/temp/log.do_populate_lic.4246
ERROR: Task
(/workdir/repo/poky/../meta-java/recipes-core/xml-commons/jdom_1.1.3.bb:do_populate_lic)
failed with exit code '1'
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/xml-commons/jdom_1.1.3.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/xml-commons/jdom_1.1.3.bb
b/recipes-core/xml-commons/jdom_1.1.3.bb
index 8997bcc..8073819 100644
--- a/recipes-core/xml-commons/jdom_1.1.3.bb
+++ b/recipes-core/xml-commons/jdom_1.1.3.bb
@@ -14,6 +14,8 @@ SRC_URI[sha256sum] =
"d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47
inherit java-library
+S = "${WORKDIR}/${PN}"
+
do_compile() {
mkdir -p build
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 05/23] jamvm: Do not build for aarch64 targets
Avoids:
| configure: error: aarch64-poky-linux-gnu not supported
| NOTE: The following config.log files may provide further information.
| NOTE:
/workdir/build/tmp/work/aarch64-poky-linux/jamvm/2.0.0-devel+gitAUTOINC+6cef41d859-r0/build/config.log
| ERROR: configure failed
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/jamvm/jamvm_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb
index 1762ade..57f7e64 100644
--- a/recipes-core/jamvm/jamvm_git.bb
+++ b/recipes-core/jamvm/jamvm_git.bb
@@ -15,3 +15,4 @@ SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git \
S = "${WORKDIR}/git"
+COMPATIBLE_MACHINE_aarch64 = "-"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 07/23] javasqlite: Create cc tool to make libtool happy
Libtool has hardcoded cc as the name for the compiler. We make a script
that calls gcc.
Fixes:
| ./libtool --mode=link cc
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include/linux
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/include
-DHAVE_SQLITE2=0 -DHAVE_SQLITE3=1 -DHAVE_SQLITE_FUNCTION_TYPE=0
-DHAVE_SQLITE_OPEN_AUX_FILE=0 -DHAVE_SQLITE_SET_AUTHORIZER=0
-DHAVE_SQLITE_TRACE=0 -DHAVE_SQLITE_COMPILE=0 -DHAVE_SQLITE_PROGRESS_HANDLER=0
-DHAVE_SQLITE3_MALLOC=1 -DHAVE_SQLITE3_PREPARE_V2=1
-DHAVE_SQLITE3_PREPARE16_V2=1 -DHAVE_SQLITE3_BIND_ZEROBLOB=1
-DHAVE_SQLITE3_CLEAR_BINDINGS=1 -DHAVE_SQLITE3_COLUMN_TABLE_NAME16=0
-DHAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 -DHAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0
-DHAVE_SQLITE3_BIND_PARAMETER_COUNT=1 -DHAVE_SQLITE3_BIND_PARAMETER_NAME=1
-DHAVE_SQLITE3_BIND_PARAMETER_INDEX=1 -DHAVE_SQLITE3_RESULT_ZEROBLO
B=1 -DHAVE_SQLITE3_INCRBLOBIO=1 -DHAVE_SQLITE3_KEY=0
-DHAVE_SQLITE3_SHARED_CACHE=1 -DHAVE_SQLITE3_OPEN_V2=1
-DHAVE_SQLITE3_LOAD_EXTENSION=0 -DHAVE_SQLITE3_BACKUPAPI=1
-DHAVE_SQLITE3_PROFILE=1 -DHAVE_SQLITE3_STATUS=1 -DHAVE_SQLITE3_DB_STATUS=1
-DHAVE_SQLITE3_STMT_STATUS=1 -DCANT_PASS_VALIST_AS_CHARPTR=1
-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DLL=1 -o native/mkconst
native/mkconst.c
| libtool: link: cc
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/lib/jvm/icedtea7-native//include/linux
-I/workdir/build/tmp/work/dbfp4-poky-linux/javasqlite/20150419-r0/recipe-sysroot-native/usr/include
-DHAVE_SQLITE2=0 -DHAVE_SQLITE3=1 -DHAVE_SQLITE_FUNCTION_TYPE=0
-DHAVE_SQLITE_OPEN_AUX_FILE=0 -DHAVE_SQLITE_SET_AUTHORIZER=0
-DHAVE_SQLITE_TRACE=0 -DHAVE_SQLITE_COMPILE=0 -DHAVE_SQLITE_PROGRESS_HANDLER=0
-DHAVE_SQLITE3_MALLOC=1 -DHAVE_SQLITE3_PREPARE_V2=1
-DHAVE_SQLITE3_PREPARE16_V2=1 -DHAVE_SQLITE3_BIND_ZEROBLOB=1
-DHAVE_SQLITE3_CLEAR_BINDINGS=1 -DHAVE_SQLITE3_COLUMN_TABLE_NAME16=0
-DHAVE_SQLITE3_COLUMN_DATABASE_NAME16=0 -DHAVE_SQLITE3_COLUMN_ORIGIN_NAME16=0
-DHAVE_SQLITE3_BIND_PARAMETER_COUNT=1 -DHAVE_SQLITE3_BIND_PARAMETER_NAME=1
-DHAVE_SQLITE3_BIND_PARAMETER_INDEX=1 -DHAVE_SQLITE3_RESULT_ZEROBLOB=1 -DHA
VE_SQLITE3_INCRBLOBIO=1 -DHAVE_SQLITE3_KEY=0 -DHAVE_SQLITE3_SHARED_CACHE=1
-DHAVE_SQLITE3_OPEN_V2=1 -DHAVE_SQLITE3_LOAD_EXTENSION=0
-DHAVE_SQLITE3_BACKUPAPI=1 -DHAVE_SQLITE3_PROFILE=1 -DHAVE_SQLITE3_STATUS=1
-DHAVE_SQLITE3_DB_STATUS=1 -DHAVE_SQLITE3_STMT_STATUS=1
-DCANT_PASS_VALIST_AS_CHARPTR=1 -DSQLITE_ENABLE_COLUMN_METADATA=1
-DSQLITE_DLL=1 -o native/mkconst native/mkconst.c
| ./libtool: line 1720: cc: command not found
| make: *** [Makefile:222: native/mkconst] Error 127
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/javasqlite/javasqlite_20150419.bb | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/recipes-core/javasqlite/javasqlite_20150419.bb
b/recipes-core/javasqlite/javasqlite_20150419.bb
index d721d66..6a41cee 100644
--- a/recipes-core/javasqlite/javasqlite_20150419.bb
+++ b/recipes-core/javasqlite/javasqlite_20150419.bb
@@ -7,7 +7,7 @@ That API is wrapped by methods in the SQLite.Database class."
LICENSE = "BSD"
SECTION = "application"
-PR = "r0"
+PE = "1"
SRC_URI = " \
http://www.ch-werner.de/javasqlite/${BPN}-${PV}.tar.gz \
file://0001-fix-errors-during-cross-compile.patch \
@@ -40,3 +40,9 @@ INSANE_SKIP_${PN}-dev = "dev-elf"
do_configure_append (){
cp ${S}/*-libtool ${S}/libtool
}
+
+do_compile_prepend (){
+ echo '#!/bin/sh' > ${STAGING_BINDIR_NATIVE}/cc
+ echo 'gcc $@' >> ${STAGING_BINDIR_NATIVE}/cc
+ chmod a+x ${STAGING_BINDIR_NATIVE}/cc
+}
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 06/23] cacao: Do not build for aarch64 targets
Avoids:
| configure: error: aarch64 systems are currently not supported.
| NOTE: The following config.log files may provide further information.
| NOTE:
/workdir/build/tmp/work/aarch64-poky-linux/cacao/1.6.1-r0/cacao-1.6.1/src/mm/boehm-gc/libatomic_ops/config.log
/workdir/build/tmp/work/aarch64-poky-linux/cacao/1.6.1-r0/cacao-1.6.1/config.log
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/cacao/cacao_1.6.1.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/cacao/cacao_1.6.1.bb
b/recipes-core/cacao/cacao_1.6.1.bb
index 1074ff5..a55d877 100644
--- a/recipes-core/cacao/cacao_1.6.1.bb
+++ b/recipes-core/cacao/cacao_1.6.1.bb
@@ -63,3 +63,5 @@ FILES_${PN}-dbg += "${bindir}/.debug
${libdir}/.debug/lib*.so*"
FILES_${PN}-doc += "${datadir}/gc"
BBCLASSEXTEND = "native"
+
+COMPATIBLE_MACHINE_aarch64 = "-"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 01/23] icedtea7: Add x11 as default pkgconfig
Seems to be a basic dependency, not optional.
Fixes:
| checking X11/X.h usability... no
| checking X11/X.h presence... no
| checking for X11/X.h... no
| configure: error: "xorg headers were not found -
| try installing xorg-x11-proto-devel."
| NOTE: The following config.log files may provide further information.
| NOTE:
/workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/config.log
| ERROR: configure failed
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_configure (log file is located at
/workdir/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/temp/log.do_configure.29594)
ERROR: Task
(/workdir/repo/poky/../meta-java/recipes-core/icedtea/icedtea7-native_2.1.3.bb:do_configure)
failed with exit code '1'
Signed-off-by: Ricardo Ribalda Delgado
---
recipes-core/icedtea/icedtea7-native.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-core/icedtea/icedtea7-native.inc
b/recipes-core/icedtea/icedtea7-native.inc
index 69f5d25..747bb72 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -11,7 +11,7 @@ DEPENDS = "virtual/javac-native virtual/java-native
classpath-native \
unzip-native make-native util-linux-native\
"
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "x11"
PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native
libxt-native libxext-native libxrender-native"
OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '',
'BUILD_HEADLESS_ONLY=1', d)}"
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 00/23] Multiple patches for multiconfig
Patches to build meta-java with multiconfig and aarch64. Ricardo Ribalda Delgado (23): icedtea7: Add x11 as default pkgconfig openjd7: remove support for kerberos openjd8: remove support for kerberos classpath: Fix build with targets aarch64 jamvm: Do not build for aarch64 targets cacao: Do not build for aarch64 targets javasqlite: Create cc tool to make libtool happy jdon: Fix location of S rxtx: Fix path of javac jamvm: Fix binary location for ecj-initial cup: Do not use all as PACKAGE_ARCH dbus-java: Do not use all as PACKAGE_ARCH rhino: Do not use all as PACKAGE_ARCH ca-certificates: Cannot be an allarch package xalan-j: Do not use all as PACKAGE_ARCH xom: Do not use all as PACKAGE_ARCH jaxen: Do not build an all PACKAGE_ARCH jlex: Do not build as an all PACKAGE_ARCH bsf: Do not build as all PACKAGE_ARCH poi: Do not build as all PACKAGE_ARCH xom: Allow re-running do_compile jdom: Do not use all as PACKAGE_ARCH dom4j: Do not use all as PACKAGE_ARCH .../ca-certificates-java_20180516.bb | 2 +- recipes-core/cacao/cacao_1.6.1.bb | 2 ++ .../classpath/classpath-0.99/aarch64.patch| 19 +++ recipes-core/classpath/classpath_0.99.bb | 1 + recipes-core/cup/cup_0.10k.bb | 1 + recipes-core/icedtea/icedtea7-native.inc | 2 +- recipes-core/jakarta-libs/bsf_2.4.0.bb| 4 +++- recipes-core/jakarta-libs/poi_3.0.bb | 2 ++ recipes-core/jamvm/jamvm.inc | 2 +- recipes-core/jamvm/jamvm_git.bb | 1 + .../javasqlite/javasqlite_20150419.bb | 8 ++- recipes-core/jlex/jlex_1.2.6.bb | 2 ++ recipes-core/openjdk/openjdk-7-common.inc | 3 ++- recipes-core/openjdk/openjdk-8-cross.inc | 2 +- recipes-core/rhino/rhino_1.7r4.bb | 2 ++ recipes-core/xalan-j/xalan-j_2.7.1.bb | 4 +++- recipes-core/xml-commons/dom4j_1.6.1.bb | 1 + recipes-core/xml-commons/jaxen_1.1.6.bb | 2 ++ recipes-core/xml-commons/jdom_1.1.3.bb| 4 recipes-core/xml-commons/xom_1.2.10.bb| 9 ++-- recipes-extended/dbus/dbus-java_2.7.bb| 4 +++- recipes-extended/rxtx/files/javapath.patch| 23 +++ recipes-extended/rxtx/rxtx_2.2.0.bb | 5 ++-- 23 files changed, 92 insertions(+), 13 deletions(-) create mode 100644 recipes-core/classpath/classpath-0.99/aarch64.patch create mode 100644 recipes-extended/rxtx/files/javapath.patch -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH] classpath: Fix build with aarch64
Fixes: | In file included from ../../../classpath-0.99/native/fdlibm/fdlibm.h:36, | from ../../../classpath-0.99/native/fdlibm/e_exp.c:76: | ../../../classpath-0.99/native/fdlibm/ieeefp.h:163:2: error: #error Endianess not declared!! | #error Endianess not declared!! | ^ | In file included from ../../classpath-0.99/native/fdlibm/fdlibm.h:40, Signed-off-by: Ricardo Ribalda Delgado --- .../classpath/classpath-0.99/aarch64.patch| 19 +++ recipes-core/classpath/classpath_0.99.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 recipes-core/classpath/classpath-0.99/aarch64.patch diff --git a/recipes-core/classpath/classpath-0.99/aarch64.patch b/recipes-core/classpath/classpath-0.99/aarch64.patch new file mode 100644 index 000..4de40fb --- /dev/null +++ b/recipes-core/classpath/classpath-0.99/aarch64.patch @@ -0,0 +1,19 @@ +Upstream-Status: Inappropriate [upstream is dead] + +Signed-off-by: Ricardo Ribalda + +diff --git a/native/fdlibm/ieeefp.h b/native/fdlibm/ieeefp.h +index c230bbb..700dd3a 100644 +--- a/native/fdlibm/ieeefp.h b/native/fdlibm/ieeefp.h +@@ -158,6 +158,10 @@ + #define __IEEE_BIG_ENDIAN + #endif + ++#ifdef __aarch64__ ++#define __IEEE_LITTLE_ENDIAN ++#endif ++ + #ifndef __IEEE_BIG_ENDIAN + #ifndef __IEEE_LITTLE_ENDIAN + #error Endianess not declared!! diff --git a/recipes-core/classpath/classpath_0.99.bb b/recipes-core/classpath/classpath_0.99.bb index 6aa3baa..714503a 100644 --- a/recipes-core/classpath/classpath_0.99.bb +++ b/recipes-core/classpath/classpath_0.99.bb @@ -14,6 +14,7 @@ SRC_URI += " \ file://toolwrapper-exithook.patch \ file://use_libdir.patch \ file://freetype2.patch \ +file://aarch64.patch \ " SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] Information about non-traditional uses of the Yocto Project and OpenEmbedded
Hi We (qtec.com) use yocto/oe to build industrial vision systems. Today is running on Potato graders, Carrot Graders, Potato 3d cameras, Hyperspectral cameras, Beer analysers, Checkweighers, Screw Counters, Hockey streamers Let me know if you think this is interesting and I can share more detailed info. On Wed, Feb 27, 2019 at 9:16 PM Scott Rifenbark wrote: > > Sounds like good potential for a section or chapter in the user docs. > > Scott > > On Wed, Feb 27, 2019 at 12:01 PM Philip Balister wrote: >> >> During the last OpenEmbedded developer meeting, it became clear that >> people are using the Yocto project/OpenEmbedded in spaces outside what >> we think of as traditional embedded. Lieu Ta is working on a >> presentation for the Linux Foundation Leadership Summit and we would >> like to collect as many "unusual" applications are possible from >> companies we can publicly acknowledge. Unusual is edge, containers, >> desktop, etc. Or even really interesting embedded applications :) >> >> Please drop me an email (off list is fine) with enough info for us to >> add you to a slide and acknowledge your work. >> >> Thanks, >> >> Philip >> -- >> ___ >> Openembedded-core mailing list >> openembedded-c...@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- > ___ > Openembedded-core mailing list > openembedded-c...@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Ricardo Ribalda -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-clang][PATCH] clang: Fix sigsegv of llvm-config on the target
Sorry for the spam. The SOB is missing this this patch. Shall I resend?
On Wed, May 30, 2018 at 10:49 AM Ricardo Ribalda Delgado <
ricardo.riba...@gmail.com> wrote:
> llvm-config is, by default, broken by the SSTATE_SCAN_CMD. This patch
> removes llvm-config from SSTATE_SCAN_FILES.
> ---
> recipes-devtools/clang/clang_git.bb | 3 +++
> 1 file changed, 3 insertions(+)
> diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/
clang_git.bb
> index 5730b9b..3e2d2c7 100644
> --- a/recipes-devtools/clang/clang_git.bb
> +++ b/recipes-devtools/clang/clang_git.bb
> @@ -158,3 +158,6 @@ FILES_${PN}-dev += "\
> INSANE_SKIP_${PN} += "already-stripped"
> INSANE_SKIP_${PN}-dev += "dev-elf"
> +
> +#Avoid SSTATE_SCAN_COMMAND running sed over llvm-config.
> +SSTATE_SCAN_FILES_remove = "*-config"
> --
> 2.17.0
--
Ricardo Ribalda
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-clang][PATCH] clang: Fix sigsegv of llvm-config on the target
llvm-config is, by default, broken by the SSTATE_SCAN_CMD. This patch
removes llvm-config from SSTATE_SCAN_FILES.
---
recipes-devtools/clang/clang_git.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/recipes-devtools/clang/clang_git.bb
b/recipes-devtools/clang/clang_git.bb
index 5730b9b..3e2d2c7 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -158,3 +158,6 @@ FILES_${PN}-dev += "\
INSANE_SKIP_${PN} += "already-stripped"
INSANE_SKIP_${PN}-dev += "dev-elf"
+
+#Avoid SSTATE_SCAN_COMMAND running sed over llvm-config.
+SSTATE_SCAN_FILES_remove = "*-config"
--
2.17.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] clang: Fix sigsegv of llvm-config on the target
llvm-config is, by default, broken by the SSTATE_SCAN_CMD. This patch
removes llvm-config from SSTATE_SCAN_FILES.
---
recipes-devtools/clang/clang_git.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/recipes-devtools/clang/clang_git.bb
b/recipes-devtools/clang/clang_git.bb
index 5730b9b..3e2d2c7 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -158,3 +158,6 @@ FILES_${PN}-dev += "\
INSANE_SKIP_${PN} += "already-stripped"
INSANE_SKIP_${PN}-dev += "dev-elf"
+
+#Avoid SSTATE_SCAN_COMMAND running sed over llvm-config.
+SSTATE_SCAN_FILES_remove = "*-config"
--
2.17.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] opencv: Fix error when dynamic link
Hi armin
You are right, I screwed up when I ported it from my tree.
v2 on its way
cheers!
On Wed, Nov 22, 2017 at 9:25 PM, akuster808 <akuster...@gmail.com> wrote:
> Richardo,
>
>
> On 11/22/2017 11:19 AM, Ricardo Ribalda Delgado wrote:
>> If opencv was imported in python or dynamic linked in gstreamer it was
>> producing this output and dying:
>>
>> [libprotobuf ERROR google/protobuf/descriptor_database.cc:58] File already
>> exists in database: caffe.proto
>> [libprotobuf FATAL google/protobuf/descriptor.cc:1315] CHECK failed:
>> generated_database_->Add(encoded_file_descriptor, size):
>> terminate called after throwing an instance of
>> 'google::protobuf::FatalException'
>>
>> This patch backports a patch that fixes this issue.
>>
>> Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
>> ---
>> .../recipes-support/opencv/already-exists.patch| 394
>> +
>
> This patch is in the wrong path. It should be in
> meta-oe/recipes-support/opencv/opencv , one level down.
>
> - armin
>> meta-oe/recipes-support/opencv/opencv_3.3.bb | 1 +
>> 2 files changed, 395 insertions(+)
>> create mode 100644 meta-oe/recipes-support/opencv/already-exists.patch
>>
>> diff --git a/meta-oe/recipes-support/opencv/already-exists.patch
>> b/meta-oe/recipes-support/opencv/already-exists.patch
>> new file mode 100644
>> index ..6e24f2de8715
>> --- /dev/null
>> +++ b/meta-oe/recipes-support/opencv/already-exists.patch
>> @@ -0,0 +1,394 @@
>> +From e4bf148cddf277834e57c9afeec8daff8378a655 Mon Sep 17 00:00:00 2001
>> +From: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
>> +Date: Wed, 22 Nov 2017 15:27:07 +0100
>> +Subject: [PATCH] Fix: File already exists in database: caffe.proto
>> +
>> +Fixes error when importing python cv
>> +
>> +Upstream-status: Backport https://github.com/opencv/opencv/pull/10092
>> +Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
>> +---
>> + modules/dnn/CMakeLists.txt| 6 +++---
>> + modules/dnn/src/caffe/caffe_importer.cpp | 1 -
>> + modules/dnn/src/caffe/caffe_io.cpp| 1 -
>> + modules/dnn/src/caffe/caffe_io.hpp| 2 +-
>> + modules/dnn/src/caffe/{caffe.proto => opencv-caffe.proto} | 0
>> + 5 files changed, 4 insertions(+), 6 deletions(-)
>> + rename modules/dnn/src/caffe/{caffe.proto => opencv-caffe.proto} (100%)
>> +
>> +diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
>> +index c6329a742263..8ef00ef983ff 100644
>> +--- a/modules/dnn/CMakeLists.txt
>> b/modules/dnn/CMakeLists.txt
>> +@@ -55,13 +55,13 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS
>> +
>> + if(PROTOBUF_UPDATE_FILES)
>> + file(GLOB proto_files src/tensorflow/*.proto)
>> +- list(APPEND proto_files src/caffe/caffe.proto)
>> ++ list(APPEND proto_files src/caffe/opencv-caffe.proto)
>> + PROTOBUF_GENERATE_CPP(Protobuf_HDRS Protobuf_SRCS ${proto_files})
>> + else()
>> + file(GLOB fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.cc)
>> + file(GLOB fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.h)
>> +- list(APPEND fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.cc)
>> +- list(APPEND fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.h)
>> ++ list(APPEND fw_srcs
>> ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/opencv-caffe.pb.cc)
>> ++ list(APPEND fw_hdrs
>> ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/opencv-caffe.pb.h)
>> + list(APPEND Protobuf_SRCS ${fw_srcs})
>> + list(APPEND Protobuf_HDRS ${fw_hdrs})
>> + list(APPEND Protobuf_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe)
>> +diff --git a/modules/dnn/src/caffe/caffe_importer.cpp
>> b/modules/dnn/src/caffe/caffe_importer.cpp
>> +index c075651b95b3..2c977c84b0f4 100644
>> +--- a/modules/dnn/src/caffe/caffe_importer.cpp
>> b/modules/dnn/src/caffe/caffe_importer.cpp
>> +@@ -42,7 +42,6 @@
>> + #include "../precomp.hpp"
>> +
>> + #ifdef HAVE_PROTOBUF
>> +-#include "caffe.pb.h"
>> +
>> + #include
>> + #include
>> +diff --git a/modules/dnn/src/caffe/caffe_io.cpp
>> b/modules/dnn/src/caffe/caffe_io.cpp
>> +index 0f46ea77df9a..1d3c518f1328 100644
>> +--- a/modules/dnn/src/caffe/caffe_io.cpp
>> b/modules/dnn/src/caffe/caffe_io.cpp
>> +@@ -99,7 +99,6 @@
>> + #include
>> + #include
>> +
>> +-#include "caffe.pb.h"
>> +
[oe] [meta-oe][PATCH v2] opencv: Fix error when dynamic link
If opencv was imported in python or dynamic linked in gstreamer it was
producing this output and dying:
[libprotobuf ERROR google/protobuf/descriptor_database.cc:58] File already
exists in database: caffe.proto
[libprotobuf FATAL google/protobuf/descriptor.cc:1315] CHECK failed:
generated_database_->Add(encoded_file_descriptor, size):
terminate called after throwing an instance of
'google::protobuf::FatalException'
This patch backports a patch that fixes this issue.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
.../opencv/opencv/already-exists.patch | 394 +
meta-oe/recipes-support/opencv/opencv_3.3.bb | 1 +
2 files changed, 395 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/opencv/already-exists.patch
diff --git a/meta-oe/recipes-support/opencv/opencv/already-exists.patch
b/meta-oe/recipes-support/opencv/opencv/already-exists.patch
new file mode 100644
index ..6e24f2de8715
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/already-exists.patch
@@ -0,0 +1,394 @@
+From e4bf148cddf277834e57c9afeec8daff8378a655 Mon Sep 17 00:00:00 2001
+From: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
+Date: Wed, 22 Nov 2017 15:27:07 +0100
+Subject: [PATCH] Fix: File already exists in database: caffe.proto
+
+Fixes error when importing python cv
+
+Upstream-status: Backport https://github.com/opencv/opencv/pull/10092
+Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
+---
+ modules/dnn/CMakeLists.txt| 6 +++---
+ modules/dnn/src/caffe/caffe_importer.cpp | 1 -
+ modules/dnn/src/caffe/caffe_io.cpp| 1 -
+ modules/dnn/src/caffe/caffe_io.hpp| 2 +-
+ modules/dnn/src/caffe/{caffe.proto => opencv-caffe.proto} | 0
+ 5 files changed, 4 insertions(+), 6 deletions(-)
+ rename modules/dnn/src/caffe/{caffe.proto => opencv-caffe.proto} (100%)
+
+diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
+index c6329a742263..8ef00ef983ff 100644
+--- a/modules/dnn/CMakeLists.txt
b/modules/dnn/CMakeLists.txt
+@@ -55,13 +55,13 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS
+
+ if(PROTOBUF_UPDATE_FILES)
+ file(GLOB proto_files src/tensorflow/*.proto)
+- list(APPEND proto_files src/caffe/caffe.proto)
++ list(APPEND proto_files src/caffe/opencv-caffe.proto)
+ PROTOBUF_GENERATE_CPP(Protobuf_HDRS Protobuf_SRCS ${proto_files})
+ else()
+ file(GLOB fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.cc)
+ file(GLOB fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.h)
+- list(APPEND fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.cc)
+- list(APPEND fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.h)
++ list(APPEND fw_srcs
${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/opencv-caffe.pb.cc)
++ list(APPEND fw_hdrs
${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/opencv-caffe.pb.h)
+ list(APPEND Protobuf_SRCS ${fw_srcs})
+ list(APPEND Protobuf_HDRS ${fw_hdrs})
+ list(APPEND Protobuf_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe)
+diff --git a/modules/dnn/src/caffe/caffe_importer.cpp
b/modules/dnn/src/caffe/caffe_importer.cpp
+index c075651b95b3..2c977c84b0f4 100644
+--- a/modules/dnn/src/caffe/caffe_importer.cpp
b/modules/dnn/src/caffe/caffe_importer.cpp
+@@ -42,7 +42,6 @@
+ #include "../precomp.hpp"
+
+ #ifdef HAVE_PROTOBUF
+-#include "caffe.pb.h"
+
+ #include
+ #include
+diff --git a/modules/dnn/src/caffe/caffe_io.cpp
b/modules/dnn/src/caffe/caffe_io.cpp
+index 0f46ea77df9a..1d3c518f1328 100644
+--- a/modules/dnn/src/caffe/caffe_io.cpp
b/modules/dnn/src/caffe/caffe_io.cpp
+@@ -99,7 +99,6 @@
+ #include
+ #include
+
+-#include "caffe.pb.h"
+ #include "caffe_io.hpp"
+ #include "glog_emulator.hpp"
+
+diff --git a/modules/dnn/src/caffe/caffe_io.hpp
b/modules/dnn/src/caffe/caffe_io.hpp
+index 09bc5709a24e..f5912c3bcec1 100644
+--- a/modules/dnn/src/caffe/caffe_io.hpp
b/modules/dnn/src/caffe/caffe_io.hpp
+@@ -91,7 +91,7 @@
+ #define __OPENCV_DNN_CAFFE_IO_HPP__
+ #ifdef HAVE_PROTOBUF
+
+-#include "caffe.pb.h"
++#include "opencv-caffe.pb.h"
+
+ namespace cv {
+ namespace dnn {
+diff --git a/modules/dnn/src/caffe/caffe.proto
b/modules/dnn/src/caffe/opencv-caffe.proto
+similarity index 100%
+rename from modules/dnn/src/caffe/caffe.proto
+rename to modules/dnn/src/caffe/opencv-caffe.proto
+diff --git a/modules/dnn/src/layers/detection_output_layer.cpp
b/modules/dnn/src/layers/detection_output_layer.cpp
+index 0b72326f7e7d..f413bad5b81a 100644
+--- a/modules/dnn/src/layers/detection_output_layer.cpp
b/modules/dnn/src/layers/detection_output_layer.cpp
+@@ -44,7 +44,7 @@
+ #include "layers_common.hpp"
+ #include
+ #include
+-#include
++#include
+
+ namespace cv
+ {
+diff --git a/modules/dnn/src/caffe/caffe_importer.cpp
b/modules/dnn/src/caffe/caffe_i
[oe] [meta-oe][PATCH] opencv: Fix error when dynamic link
If opencv was imported in python or dynamic linked in gstreamer it was
producing this output and dying:
[libprotobuf ERROR google/protobuf/descriptor_database.cc:58] File already
exists in database: caffe.proto
[libprotobuf FATAL google/protobuf/descriptor.cc:1315] CHECK failed:
generated_database_->Add(encoded_file_descriptor, size):
terminate called after throwing an instance of
'google::protobuf::FatalException'
This patch backports a patch that fixes this issue.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
.../recipes-support/opencv/already-exists.patch| 394 +
meta-oe/recipes-support/opencv/opencv_3.3.bb | 1 +
2 files changed, 395 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/already-exists.patch
diff --git a/meta-oe/recipes-support/opencv/already-exists.patch
b/meta-oe/recipes-support/opencv/already-exists.patch
new file mode 100644
index ..6e24f2de8715
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/already-exists.patch
@@ -0,0 +1,394 @@
+From e4bf148cddf277834e57c9afeec8daff8378a655 Mon Sep 17 00:00:00 2001
+From: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
+Date: Wed, 22 Nov 2017 15:27:07 +0100
+Subject: [PATCH] Fix: File already exists in database: caffe.proto
+
+Fixes error when importing python cv
+
+Upstream-status: Backport https://github.com/opencv/opencv/pull/10092
+Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
+---
+ modules/dnn/CMakeLists.txt| 6 +++---
+ modules/dnn/src/caffe/caffe_importer.cpp | 1 -
+ modules/dnn/src/caffe/caffe_io.cpp| 1 -
+ modules/dnn/src/caffe/caffe_io.hpp| 2 +-
+ modules/dnn/src/caffe/{caffe.proto => opencv-caffe.proto} | 0
+ 5 files changed, 4 insertions(+), 6 deletions(-)
+ rename modules/dnn/src/caffe/{caffe.proto => opencv-caffe.proto} (100%)
+
+diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
+index c6329a742263..8ef00ef983ff 100644
+--- a/modules/dnn/CMakeLists.txt
b/modules/dnn/CMakeLists.txt
+@@ -55,13 +55,13 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS
+
+ if(PROTOBUF_UPDATE_FILES)
+ file(GLOB proto_files src/tensorflow/*.proto)
+- list(APPEND proto_files src/caffe/caffe.proto)
++ list(APPEND proto_files src/caffe/opencv-caffe.proto)
+ PROTOBUF_GENERATE_CPP(Protobuf_HDRS Protobuf_SRCS ${proto_files})
+ else()
+ file(GLOB fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.cc)
+ file(GLOB fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.h)
+- list(APPEND fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.cc)
+- list(APPEND fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.h)
++ list(APPEND fw_srcs
${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/opencv-caffe.pb.cc)
++ list(APPEND fw_hdrs
${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/opencv-caffe.pb.h)
+ list(APPEND Protobuf_SRCS ${fw_srcs})
+ list(APPEND Protobuf_HDRS ${fw_hdrs})
+ list(APPEND Protobuf_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe)
+diff --git a/modules/dnn/src/caffe/caffe_importer.cpp
b/modules/dnn/src/caffe/caffe_importer.cpp
+index c075651b95b3..2c977c84b0f4 100644
+--- a/modules/dnn/src/caffe/caffe_importer.cpp
b/modules/dnn/src/caffe/caffe_importer.cpp
+@@ -42,7 +42,6 @@
+ #include "../precomp.hpp"
+
+ #ifdef HAVE_PROTOBUF
+-#include "caffe.pb.h"
+
+ #include
+ #include
+diff --git a/modules/dnn/src/caffe/caffe_io.cpp
b/modules/dnn/src/caffe/caffe_io.cpp
+index 0f46ea77df9a..1d3c518f1328 100644
+--- a/modules/dnn/src/caffe/caffe_io.cpp
b/modules/dnn/src/caffe/caffe_io.cpp
+@@ -99,7 +99,6 @@
+ #include
+ #include
+
+-#include "caffe.pb.h"
+ #include "caffe_io.hpp"
+ #include "glog_emulator.hpp"
+
+diff --git a/modules/dnn/src/caffe/caffe_io.hpp
b/modules/dnn/src/caffe/caffe_io.hpp
+index 09bc5709a24e..f5912c3bcec1 100644
+--- a/modules/dnn/src/caffe/caffe_io.hpp
b/modules/dnn/src/caffe/caffe_io.hpp
+@@ -91,7 +91,7 @@
+ #define __OPENCV_DNN_CAFFE_IO_HPP__
+ #ifdef HAVE_PROTOBUF
+
+-#include "caffe.pb.h"
++#include "opencv-caffe.pb.h"
+
+ namespace cv {
+ namespace dnn {
+diff --git a/modules/dnn/src/caffe/caffe.proto
b/modules/dnn/src/caffe/opencv-caffe.proto
+similarity index 100%
+rename from modules/dnn/src/caffe/caffe.proto
+rename to modules/dnn/src/caffe/opencv-caffe.proto
+diff --git a/modules/dnn/src/layers/detection_output_layer.cpp
b/modules/dnn/src/layers/detection_output_layer.cpp
+index 0b72326f7e7d..f413bad5b81a 100644
+--- a/modules/dnn/src/layers/detection_output_layer.cpp
b/modules/dnn/src/layers/detection_output_layer.cpp
+@@ -44,7 +44,7 @@
+ #include "layers_common.hpp"
+ #include
+ #include
+-#include
++#include
+
+ namespace cv
+ {
+diff --git a/modules/dnn/src/caffe/caffe_importer.cpp
b/modules/dnn/src/caffe/caffe_importer.cpp
+index 2c9
Re: [oe] [meta-oe][PATCH] meson: update meson to 0.43.0
Hi Alex On Thu, Nov 16, 2017 at 11:08 AM, Alexander Kanavin <alexander.kana...@linux.intel.com> wrote: > On 11/15/2017 04:15 PM, Ricardo Ribalda Delgado wrote: >> >> Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> > > > Meson is being moved to oe-core; can you please check the patches posted to > oe-core list? Do you mean review the patches on oe-core , or port my patches to oe-core? Thanks! > > > Alex -- Ricardo Ribalda -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] meson: update meson to 0.43.0
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
.../meson/meson/native_bindir.patch| 59 ++
.../meson/{meson_0.40.1.bb => meson_0.43.0.bb} | 2 +-
2 files changed, 39 insertions(+), 22 deletions(-)
rename meta-oe/recipes-devtools/meson/{meson_0.40.1.bb => meson_0.43.0.bb}
(88%)
diff --git a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
index 993e9750e33e..805c1f6a50dc 100644
--- a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
+++ b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
@@ -1,22 +1,32 @@
+From 01dd18c9c9c042268b87d576624c16fc74253cd9 Mon Sep 17 00:00:00 2001
+From: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
+Date: Wed, 15 Nov 2017 15:05:01 +0100
+Subject: [PATCH] native_bindir
+
There are some discussions upstream to merge this patch, but I presonaly
believe
that is is OE only.
https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
-diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py
-index 04a22f985941..3e33bc4a79e7 100644
a/mesonbuild/dependencies.py
-+++ b/mesonbuild/dependencies.py
-@@ -95,7 +95,7 @@ class Dependency:
+---
+ mesonbuild/dependencies/base.py | 14 +-
+ mesonbuild/dependencies/ui.py | 6 +++---
+ 2 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
+index 0d9742d426cb..0c8e79a8e9e3 100644
+--- a/mesonbuild/dependencies/base.py
b/mesonbuild/dependencies/base.py
+@@ -114,7 +114,7 @@ class Dependency:
def need_threads(self):
return False
-def get_pkgconfig_variable(self, variable_name):
+def get_pkgconfig_variable(self, variable_name, use_native=False):
- raise MesonException('Tried to get a pkg-config variable from a
non-pkgconfig dependency.')
+ raise NotImplementedError('{!r} is not a pkgconfig
dependency'.format(self.name))
+
- class InternalDependency(Dependency):
-@@ -224,8 +224,12 @@ class PkgConfigDependency(Dependency):
+@@ -256,8 +256,12 @@ class PkgConfigDependency(ExternalDependency):
return s.format(self.__class__.__name__, self.name, self.is_found,
self.version_reqs)
@@ -31,9 +41,9 @@ index 04a22f985941..3e33bc4a79e7 100644
return p.returncode, out.strip()
def _set_cargs(self):
-@@ -259,8 +263,8 @@ class PkgConfigDependency(Dependency):
+@@ -291,8 +295,8 @@ class PkgConfigDependency(ExternalDependency):
self.is_libtool = True
- self.libs.append(lib)
+ self.link_args.append(lib)
-def get_pkgconfig_variable(self, variable_name):
-ret, out = self._call_pkgbin(['--variable=' + variable_name,
self.name])
@@ -42,7 +52,11 @@ index 04a22f985941..3e33bc4a79e7 100644
variable = ''
if ret != 0:
if self.required:
-@@ -1091,7 +1095,7 @@ class QtBaseDependency(Dependency):
+diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
+index 8f183e54d4d2..34ef33e79ad9 100644
+--- a/mesonbuild/dependencies/ui.py
b/mesonbuild/dependencies/ui.py
+@@ -239,7 +239,7 @@ class QtBaseDependency(ExternalDependency):
self.bindir = self.get_pkgconfig_host_bins(core)
if not self.bindir:
# If exec_prefix is not defined, the pkg-config file is broken
@@ -51,16 +65,7 @@ index 04a22f985941..3e33bc4a79e7 100644
if prefix:
self.bindir = os.path.join(prefix, 'bin')
-@@ -1202,7 +1206,7 @@ class Qt5Dependency(QtBaseDependency):
- QtBaseDependency.__init__(self, 'qt5', env, kwargs)
-
- def get_pkgconfig_host_bins(self, core):
--return core.get_pkgconfig_variable('host_bins')
-+return core.get_pkgconfig_variable('host_bins', use_native=True)
-
- class Qt4Dependency(QtBaseDependency):
- def __init__(self, env, kwargs):
-@@ -1216,7 +1220,7 @@ class Qt4Dependency(QtBaseDependency):
+@@ -359,7 +359,7 @@ class Qt4Dependency(QtBaseDependency):
applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
for application in applications:
try:
@@ -69,3 +74,15 @@ index 04a22f985941..3e33bc4a79e7 100644
except MesonException:
pass
+@@ -369,7 +369,7 @@ class Qt5Dependency(QtBaseDependency):
+ QtBaseDependency.__init__(self, 'qt5', env, kwargs)
+
+ def get_pkgconfig_host_bins(self, core):
+-return core.get_pkgconfig_variable('host_bins')
++return core.get_pkgconfig_variable('host_bins', use_native=True)
+
+
+ # There are three different ways of depending on SDL2:
+--
+2.15.0
+
diff --git a/meta-oe/recipes-devtools/meson/meson_0.40.1.bb
b/meta-oe/recipes-devtoo
[oe] [PATCH 4/4] opencv: Fix java wrapper generation
During configuration the java wrappers are generated (if java
is enabled via PACKAGECOFIG).
Unfortunately, the script that generates the .java files do not handle
properly paths with special symbols, such as +.
This is just a workaround for that.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
meta-oe/recipes-support/opencv/opencv/javagen.patch | 16
meta-oe/recipes-support/opencv/opencv_3.3.bb| 1 +
2 files changed, 17 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/opencv/javagen.patch
diff --git a/meta-oe/recipes-support/opencv/opencv/javagen.patch
b/meta-oe/recipes-support/opencv/opencv/javagen.patch
new file mode 100644
index ..56526ecd80a8
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/javagen.patch
@@ -0,0 +1,16 @@
+Upstream-status: Inappropriate [OE specific]
https://github.com/opencv/opencv/pull/10039#issuecomment-342539288
+
+Signed-off-by: Ricardo Ribalda <ricardo.riba...@gmail.com>
+diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
+index 74bc0ef04169..4622fbf9a5f1 100644
+--- a/modules/java/CMakeLists.txt
b/modules/java/CMakeLists.txt
+@@ -291,7 +291,7 @@ foreach(java_file ${step3_input_files})
+ endif()
+ if(__configure)
+ configure_file("${java_file}" "${java_src_dir}/${output_name}" @ONLY)
+- elseif(NOT "${java_file}" MATCHES "${OpenCV_BINARY_DIR}/")
++ elseif(EXISTS "${java_file}" AND NOT "${java_file}" MATCHES
"${OpenCV_BINARY_DIR}/")
+ configure_file("${java_file}" "${java_src_dir}/${output_name}" COPYONLY)
+ else()
+ add_custom_command(OUTPUT "${java_src_dir}/${output_name}"
diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb
b/meta-oe/recipes-support/opencv/opencv_3.3.bb
index 8f0aa7f5499c..773bfe9f7a09 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.3.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb
@@ -57,6 +57,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
file://0001-carotene-don-t-use-__asm__-with-aarch64.patch \
file://0002-Do-not-enable-asm-with-clang.patch \
file://CVE-2017-14136.patch \
+file://javagen.patch \
file://protobuf.patch \
"
PV = "3.3+git${SRCPV}"
--
2.14.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 3/4] opencv: Download tinydnn manually
OpenCV was downloading tinydnn during configuration via a script. This
patch downloads and unpacks tinydnn manually.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
.../recipes-support/opencv/opencv/tinydnn.patch| 34 ++
meta-oe/recipes-support/opencv/opencv_3.3.bb | 6
2 files changed, 40 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/opencv/tinydnn.patch
diff --git a/meta-oe/recipes-support/opencv/opencv/tinydnn.patch
b/meta-oe/recipes-support/opencv/opencv/tinydnn.patch
new file mode 100644
index ..c433fc312d2e
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/tinydnn.patch
@@ -0,0 +1,34 @@
+Upstream-status: Inappropriate [OE specific]
+
+Signed-off-by: Ricardo Ribalda <ricardo.riba...@gmail.com>
+diff --git a/modules/dnn_modern/CMakeLists.txt
b/modules/dnn_modern/CMakeLists.txt
+index 79b64b12160b..ba06a0a163e4 100644
+--- a/modules/dnn_modern/CMakeLists.txt
b/modules/dnn_modern/CMakeLists.txt
+@@ -15,24 +15,8 @@ list(APPEND CMAKE_MODULE_PATH
${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ # MODULE REQUIREMENTS
+ #
+
+-set(TINY_DNN_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/tinydnn")
+-set(TINY_DNN_CPP_ROOT "${TINY_DNN_CPP_PATH}/tiny-dnn-1.0.0a3")
+-ocv_download(FILENAME "v1.0.0a3.tar.gz"
+- HASH "adb1c512e09ca2c7a6faef36f9c53e59"
+- URL
+- "${OPENCV_TINY_DNN_URL}"
+- "$ENV{OPENCV_TINY_DNN_URL}"
+- "https://github.com/tiny-dnn/tiny-dnn/archive/;
+- DESTINATION_DIR "${TINY_DNN_CPP_PATH}"
+- STATUS TINY_DNN_DOWNLOAD_SUCCESS
+- ID "tiny-dnn"
+- UNPACK RELATIVE_URL)
+-
+-if(NOT TINY_DNN_DOWNLOAD_SUCCESS)
+- message(STATUS "Failed to download tiny-dnn sources")
+-endif()
+-
+-find_package(TinyDNN QUIET)
++set(TINYDNN_INCLUDE_DIRS
"${OpenCV_SOURCE_DIR}/3rdparty/tinydnn/tiny-dnn-1.0.0a3")
++set(TinyDNN_FOUND TRUE)
+
+ include(CheckCXXCompilerFlag)
+ CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb
b/meta-oe/recipes-support/opencv/opencv_3.3.bb
index 1c398aacc110..8f0aa7f5499c 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.3.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb
@@ -15,6 +15,8 @@ SRCREV_contrib = "2a9d1b22ed76eb22fad1a5edf6faf4d05f207b13"
SRCREV_ipp = "a62e20676a60ee0ad6581e217fe7e4bada3b95db"
SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
+SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59"
+SRC_URI[tinydnn.sha256sum] =
"e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b"
def ipp_filename(d):
import re
@@ -41,9 +43,11 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20170418;destsuffix=ipp;name=ipp
\
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc
\
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg
\
+
https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz;destsuffix=git/3rdparty/tinydnn/tiny-dnn-1.0.0a3;name=tinydnn;unpack=false
\
file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
file://fixpkgconfig.patch \
file://uselocalxfeatures.patch;patchdir=../contrib/ \
+file://tinydnn.patch;patchdir=../contrib/ \
file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \
file://0003-To-fix-errors-as-following.patch \
file://0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch \
@@ -60,6 +64,8 @@ PV = "3.3+git${SRCPV}"
S = "${WORKDIR}/git"
do_unpack_extra() {
+mkdir -p ${S}/3rdparty/tinydnn/
+tar xzf ${WORKDIR}/v1.0.0a3.tar.gz -C ${S}/3rdparty/tinydnn/
tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR}
cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
--
2.14.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/4] opencv: Use OE built Protobuf
When dnn is enabled via PACKAGECONFIG it requires protobuf and
protobuf-native.
This patch modifies cmake files to detect properly protobuf.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
.../recipes-support/opencv/opencv/protobuf.patch | 57 ++
meta-oe/recipes-support/opencv/opencv_3.3.bb | 1 +
2 files changed, 58 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/opencv/protobuf.patch
diff --git a/meta-oe/recipes-support/opencv/opencv/protobuf.patch
b/meta-oe/recipes-support/opencv/opencv/protobuf.patch
new file mode 100644
index ..c63dc142ea3d
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/protobuf.patch
@@ -0,0 +1,57 @@
+Upstream-status: Inappropriate [OE specific]
+
+Signed-off-by: Ricardo Ribalda <ricardo.riba...@gmail.com>
+diff --git a/cmake/OpenCVFindLibProtobuf.cmake
b/cmake/OpenCVFindLibProtobuf.cmake
+index b6ce1e7fd56b..e916ec0df2a6 100644
+--- a/cmake/OpenCVFindLibProtobuf.cmake
b/cmake/OpenCVFindLibProtobuf.cmake
+@@ -7,21 +7,21 @@ OCV_OPTION(BUILD_PROTOBUF "Force to build libprotobuf from
sources" ON)
+ OCV_OPTION(PROTOBUF_UPDATE_FILES "Force to rebuild .proto files" OFF)
+
+ if(PROTOBUF_UPDATE_FILES)
+- if(NOT DEFINED Protobuf_PROTOC_EXECUTABLE)
++ if(NOT DEFINED PROTOBUF_PROTOC_EXECUTABLE)
+ find_package(Protobuf QUIET)
+ endif()
+- if(DEFINED Protobuf_PROTOC_EXECUTABLE AND EXISTS
${Protobuf_PROTOC_EXECUTABLE})
+-message(STATUS "The protocol buffer compiler is found
(${Protobuf_PROTOC_EXECUTABLE})")
++ if(DEFINED PROTOBUF_PROTOC_EXECUTABLE AND EXISTS
${PROTOBUF_PROTOC_EXECUTABLE})
++message(STATUS "The protocol buffer compiler is found
(${PROTOBUF_PROTOC_EXECUTABLE})")
+ else()
+-message(FATAL_ERROR "The protocol buffer compiler is not found
(Protobuf_PROTOC_EXECUTABLE='${Protobuf_PROTOC_EXECUTABLE}')")
++message(FATAL_ERROR "The protocol buffer compiler is not found
(PROTOBUF_PROTOC_EXECUTABLE='${PROTOBUF_PROTOC_EXECUTABLE}')")
+ endif()
+ endif()
+
+-if(NOT BUILD_PROTOBUF AND NOT (DEFINED Protobuf_INCLUDE_DIRS AND DEFINED
Protobuf_LIBRARIES))
++if(NOT BUILD_PROTOBUF AND NOT (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED
PROTOBUF_LIBRARIES))
+ find_package(Protobuf QUIET)
+ endif()
+
+-if(Protobuf_FOUND)
++if(PROTOBUF_FOUND OR (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED
PROTOBUF_LIBRARIES))
+ # nothing
+ else()
+ set(Protobuf_LIBRARIES libprotobuf)
+diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
+index 2a71568d1a44..c6329a742263 100644
+--- a/modules/dnn/CMakeLists.txt
b/modules/dnn/CMakeLists.txt
+@@ -7,7 +7,7 @@ if(DEFINED BUILD_opencv_dnn AND NOT BUILD_opencv_dnn)
+ endif()
+
+ include(${OpenCV_SOURCE_DIR}/cmake/OpenCVFindLibProtobuf.cmake)
+-if(NOT Protobuf_FOUND)
++if(NOT PROTOBUF_FOUND)
+ ocv_module_disable(opencv_dnn)
+ endif()
+
+@@ -72,7 +72,7 @@ ocv_source_group("Src\\protobuf" FILES ${Protobuf_SRCS}
${Protobuf_HDRS})
+ ocv_module_include_directories(include ${Protobuf_INCLUDE_DIRS})
+
+ ocv_glob_module_sources(${Protobuf_SRCS} ${Protobuf_HDRS}
${CBLAS_H_PROXY_PATH})
+-ocv_create_module(${Protobuf_LIBRARIES} ${LAPACK_LIBRARIES})
++ocv_create_module(${PROTOBUF_LIBRARIES} ${LAPACK_LIBRARIES})
+ ocv_add_samples()
+ ocv_add_accuracy_tests()
+ ocv_add_perf_tests()
diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb
b/meta-oe/recipes-support/opencv/opencv_3.3.bb
index bcb17d34f8fb..1c398aacc110 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.3.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb
@@ -53,6 +53,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
file://0001-carotene-don-t-use-__asm__-with-aarch64.patch \
file://0002-Do-not-enable-asm-with-clang.patch \
file://CVE-2017-14136.patch \
+file://protobuf.patch \
"
PV = "3.3+git${SRCPV}"
--
2.14.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/4] opencv: Update ICV variable names
Since 3.3 ICV variables have been renamed. Without this patch OpenCV
configure cannot find ICV/IPP binaries.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_3.3.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb
b/meta-oe/recipes-support/opencv/opencv_3.3.bb
index dd9e4ca44f50..bcb17d34f8fb 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.3.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb
@@ -68,8 +68,8 @@ addtask unpack_extra after do_unpack before do_patch
EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
-DWITH_1394=OFF \
-DCMAKE_SKIP_RPATH=ON \
--DOPENCV_ICV_PACKAGE_DOWNLOADED=${IPP_MD5} \
--DOPENCV_ICV_PATH=${WORKDIR}/ippicv_lnx \
+-DOPENCV_ICV_HASH=${IPP_MD5} \
+-DIPPROOT=${WORKDIR}/ippicv_lnx \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1
-DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1
-DENABLE_SSE42=1", "", d)} \
--
2.14.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] bitbake.conf: Add sdl-config to HOSTTOOLS
Hi Ross On Tue, Oct 3, 2017 at 12:18 PM, Burton, Ross <ross.bur...@intel.com> wrote: > On 3 October 2017 at 10:40, Ricardo Ribalda Delgado > <ricardo.riba...@gmail.com> wrote: >> >> Without this patch bitbake cannot find sdl-config >> >> ERROR: OE-core's config sanity checker detected a potential >> misconfiguration. >> Either fix the cause of this error or at your own risk disable the checker >> (see sanity.conf). >> Following is the list of potential problems / advisories: >> >> libsdl-native is set to be ASSUME_PROVIDED but sdl-config can't be found >> in PATH. Please either install it, or configure qemu not to require sdl. > > > First, wrong list, this should go to openembedded-core@ instead of -devel@. Ups, my bad. sorry about that. I first tried to bitbake mailing list but it bounced the mail. > > qemu's configure prefers pkg-config instead of sdl-config, so why doesn't > that work for you? Long story short. -My configuration was using ASSUME_PROVIDED += "libsdl-native". probably because I have not changed the local.con for a long while. -On June I posted https://patchwork.openembedded.org/patch/141112/, which I wrongly believed that it was merged. -Also on June Richard posted f0d128ea0dfc2c403ff53a1ac1db3521854b63d5, that was merged I am now building without the assume_provided and so far it is working fine. Maybe we should remove all ASSUME_PROVIDED "libsdl-native" references on the code?: ricardo@neopili:/tmp/poky$ git grep ASSUME_PROV | grep sdl documentation/ref-manual/migration.xml: ASSUME_PROVIDED += "libsdl-native" meta-poky/conf/local.conf.sample:# by libsdl-native then uncomment the ASSUME_PROVIDED line below. meta-poky/conf/local.conf.sample:#ASSUME_PROVIDED += "libsdl-native" Best regards! -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] bitbake.conf: Add sdl-config to HOSTTOOLS
Without this patch bitbake cannot find sdl-config
ERROR: OE-core's config sanity checker detected a potential misconfiguration.
Either fix the cause of this error or at your own risk disable the checker (see
sanity.conf).
Following is the list of potential problems / advisories:
libsdl-native is set to be ASSUME_PROVIDED but sdl-config can't be found in
PATH. Please either install it, or configure qemu not to require sdl.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
meta/conf/bitbake.conf | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 2dac3a1481eb..ebd758d1d904 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -471,6 +471,9 @@ HOSTTOOLS += " \
# Tools needed to run testimage runtime image testing
HOSTTOOLS += "ip ping ps scp ssh stty"
+# Link to sdl-config if using host SDL
+HOSTTOOLS += "${@bb.utils.contains('ASSUME_PROVIDED', 'libsdl-native',
'sdl-config', '', d)}"
+
# Link to these if present
HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo"
--
2.14.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8-native: Fix sigsegv with gcc7
On Tue, Sep 26, 2017 at 4:52 PM, Maxin B. John <maxin.j...@intel.com> wrote:
> Hi,
>
> On Tue, Sep 26, 2017 at 01:26:22PM +0200, Ricardo Ribalda Delgado wrote:
>> Ping?
>
> Pushed these 3 patches to master-next. Sorry for the delay.
No worries :) Just wanted to make sure the patches were not lost in the wind.
Best regards!
>
> Best Regards,
> Maxin
>
>> On Thu, Sep 7, 2017 at 10:51 AM, Ricardo Ribalda Delgado
>> <ricardo.riba...@gmail.com> wrote:
>> > OpenJDK does not build properly with GCC7. Add the same workaround that
>> > we have for GCC6.
>> >
>> > Without this patch:
>> >
>> > | #
>> > | # A fatal error has been detected by the Java Runtime Environment:
>> > | #
>> > | # SIGSEGV (0xb) at pc=0x7fcad0efcd5b, pid=17206,
>> > tid=0x7fcab264c700
>> > | #
>> > | # JRE version: OpenJDK Runtime Environment (8.0_102-b14) (build
>> > 1.8.0_102-internal-b14)
>> > | # Java VM: OpenJDK 64-Bit Server VM (25.102-b14 mixed mode linux-amd64
>> > compressed oops)
>> > | # Problematic frame:
>> > | # V [libjvm.so+0x78bd5b] Node::Node(unsigned int)+0x2b
>> > | #
>> > | # Failed to write core dump. Core dumps have been disabled. To enable
>> > core dumping, try "ulimit -c unlimited" before starting Java again
>> > | #
>> > | # An error report file with more information is saved as:
>> > | #
>> > /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/build/hs_err_pid17206.log
>> > | [thread 140508549912320 also had an error]
>> > |
>> > | [error occurred during error reporting , id 0xb]
>> > |
>> > | #
>> > | # If you would like to submit a bug report, please visit:
>> > | # http://bugreport.java.com/bugreport/crash.jsp
>> > | #
>> >
>> > Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
>> > ---
>> > recipes-core/openjdk/openjdk-8-common.inc | 7 ---
>> > 1 file changed, 4 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/recipes-core/openjdk/openjdk-8-common.inc
>> > b/recipes-core/openjdk/openjdk-8-common.inc
>> > index def779db4d59..0c5c2c3e3d2f 100644
>> > --- a/recipes-core/openjdk/openjdk-8-common.inc
>> > +++ b/recipes-core/openjdk/openjdk-8-common.inc
>> > @@ -218,10 +218,11 @@ EXTRA_OECONF_append = "\
>> > --with-update-version=${OPENJDK_UPDATE_VERSION} \
>> > "
>> >
>> > -# GCC 6 sets the default C++ standard to C++14 and introduces dead store
>> > -# elimination by default. OpenJDK 8 is not ready for either of these
>> > -# changes.
>> > +# Since v6, GCC sets the default C++ standard to C++14 and introduces
>> > +# dead store elimination by default. OpenJDK 8 is not ready for either
>> > +# of these changes.
>> > FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
>> > +FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
>> >
>> > # All supported cross compilers support the compiler flags that were
>> > # added to make compilation with gcc6 work. But the host compiler for
>> > --
>> > 2.14.1
>> >
>>
>>
>>
>> --
>> Ricardo Ribalda
>> --
>> ___
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Ricardo Ribalda
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH] openjdk-8-common: Fix warning evaluating CFLAGS
Ping?
On Thu, Sep 7, 2017 at 11:24 AM, Ricardo Ribalda Delgado
<ricardo.riba...@gmail.com> wrote:
> Code is (on my opinion) simpler, making use of the dumpversion flag, instead
> of calling the pre-processor via a pipe.
>
> Flag has been tested on both clang gcc:
>
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-4.8
> -dumpversion
> 4.8
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-4.9
> -dumpversion
> 4.9.3
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-5 -dumpversion
> 5.4.1
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-6 -dumpversion
> 6.4.0
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-7 -dumpversion
> 7
> ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ clang-4.0
> -dumpversion
> 4.2.1
>
> Without this patch:
>
> WARNING:
>
> /home/ricardo/curro/qt5022/build-qt5022-pyro/repo/yocto/../java/recipes-core/openjdk/openjdk-8-native_102b14.bb:
> Unable to export ${CXXFLAGS}: Failure expanding variable CXXFLAGS,
> expression was
>
> -isystem/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/recipe-sysroot-native/usr/include
> -O2 -pipe -D_GLIBCXX_USE_CXX11_ABI=0 ${@version_specific_cflags(d)}
> ${@jdk_cpp_options(d)} which triggered exception IndexError: string
> index out of range
> WARNING:
>
> /home/ricardo/curro/qt5022/build-qt5022-pyro/repo/yocto/../java/recipes-core/openjdk/openjdk-8-native_102b14.bb:
> Unable to export ${CFLAGS}: Failure expanding variable CFLAGS,
> expression was
>
> -isystem/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/recipe-sysroot-native/usr/include
> -O2 -pipe -Wno-error=deprecated-declarations
> ${@version_specific_cflags(d)} ${@jdk_cpp_options(d)} which triggered
> exception IndexError: string index out of range
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
> ---
> recipes-core/openjdk/openjdk-8-common.inc | 10 +++---
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/recipes-core/openjdk/openjdk-8-common.inc
> b/recipes-core/openjdk/openjdk-8-common.inc
> index 0c5c2c3e3d2f..83828e156fb6 100644
> --- a/recipes-core/openjdk/openjdk-8-common.inc
> +++ b/recipes-core/openjdk/openjdk-8-common.inc
> @@ -238,13 +238,9 @@ def version_specific_cflags(d):
> if bb.data.inherits_class('native', d):
> from subprocess import Popen, PIPE
>
> -cmd = d.expand('${CPP} -P -').split()
> -cc = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
> -# This check is GCC specific. Clang always returns 4. For Clang
> -# __clang_major__ and __clang_minor__ need to be checked. Ideally
> -# __GNUC_MINOR__ would be checked as well, but for this recipe
> -# GCC major is all we care about.
> -version = cc.communicate(b'__GNUC__')[0].decode('utf-8')[0]
> +cmd = d.expand('${CC} -dumpversion').split()
> +cc = Popen(cmd, stdout=PIPE, stderr=PIPE)
> +version = cc.communicate()[0].decode('utf-8')[0]
> else:
> # in the cross case, trust that GCCVERSION is correct. This won't
> # work if the native toolchain is Clang, but as of this writing that
> --
> 2.14.1
>
--
Ricardo Ribalda
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-8-native: Fix sigsegv with gcc7
Ping?
On Thu, Sep 7, 2017 at 10:51 AM, Ricardo Ribalda Delgado
<ricardo.riba...@gmail.com> wrote:
> OpenJDK does not build properly with GCC7. Add the same workaround that
> we have for GCC6.
>
> Without this patch:
>
> | #
> | # A fatal error has been detected by the Java Runtime Environment:
> | #
> | # SIGSEGV (0xb) at pc=0x7fcad0efcd5b, pid=17206, tid=0x7fcab264c700
> | #
> | # JRE version: OpenJDK Runtime Environment (8.0_102-b14) (build
> 1.8.0_102-internal-b14)
> | # Java VM: OpenJDK 64-Bit Server VM (25.102-b14 mixed mode linux-amd64
> compressed oops)
> | # Problematic frame:
> | # V [libjvm.so+0x78bd5b] Node::Node(unsigned int)+0x2b
> | #
> | # Failed to write core dump. Core dumps have been disabled. To enable core
> dumping, try "ulimit -c unlimited" before starting Java again
> | #
> | # An error report file with more information is saved as:
> | #
> /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/build/hs_err_pid17206.log
> | [thread 140508549912320 also had an error]
> |
> | [error occurred during error reporting , id 0xb]
> |
> | #
> | # If you would like to submit a bug report, please visit:
> | # http://bugreport.java.com/bugreport/crash.jsp
> | #
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
> ---
> recipes-core/openjdk/openjdk-8-common.inc | 7 ---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-core/openjdk/openjdk-8-common.inc
> b/recipes-core/openjdk/openjdk-8-common.inc
> index def779db4d59..0c5c2c3e3d2f 100644
> --- a/recipes-core/openjdk/openjdk-8-common.inc
> +++ b/recipes-core/openjdk/openjdk-8-common.inc
> @@ -218,10 +218,11 @@ EXTRA_OECONF_append = "\
> --with-update-version=${OPENJDK_UPDATE_VERSION} \
> "
>
> -# GCC 6 sets the default C++ standard to C++14 and introduces dead store
> -# elimination by default. OpenJDK 8 is not ready for either of these
> -# changes.
> +# Since v6, GCC sets the default C++ standard to C++14 and introduces
> +# dead store elimination by default. OpenJDK 8 is not ready for either
> +# of these changes.
> FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
> +FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
>
> # All supported cross compilers support the compiler flags that were
> # added to make compilation with gcc6 work. But the host compiler for
> --
> 2.14.1
>
--
Ricardo Ribalda
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 1/2] icedtea-native: Fix segmentation build during build
Ping?
On Thu, Sep 7, 2017 at 10:51 AM, Ricardo Ribalda Delgado
<ricardo.riba...@gmail.com> wrote:
> Without this patch, icedtea-native do_compile() results in a SIGSEGV
> when compiled with GCC7
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
> ---
> recipes-core/icedtea/icedtea7-native.inc | 2 +
> .../openjdk-7-03b147/vframeArray_Fix_sigsegv.patch | 60
> ++
> 2 files changed, 62 insertions(+)
> create mode 100644
> recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
>
> diff --git a/recipes-core/icedtea/icedtea7-native.inc
> b/recipes-core/icedtea/icedtea7-native.inc
> index 55cb7e7a5024..7d625eb536ed 100644
> --- a/recipes-core/icedtea/icedtea7-native.inc
> +++ b/recipes-core/icedtea/icedtea7-native.inc
> @@ -43,6 +43,7 @@ SRC_URI = " \
>file://jaxws_fix_NullPointerException.patch;apply=no \
>file://timezoneszip.patch \
>file://sigsegv.patch;apply=no \
> + file://vframeArray_Fix_sigsegv.patch;apply=no \
>"
>
> S = "${WORKDIR}/${ICEDTEA}"
> @@ -154,6 +155,7 @@ do_configure_append() {
>
> patch -p1 < ${WORKDIR}/jaxws_fix_NullPointerException.patch
> patch -p1 < ${WORKDIR}/sigsegv.patch
> + patch -p1 < ${WORKDIR}/vframeArray_Fix_sigsegv.patch
> }
>
> EXTRA_OEMAKE = ' \
> diff --git
> a/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
> b/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
> new file mode 100644
> index ..62fe8b207011
> --- /dev/null
> +++ b/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
> @@ -0,0 +1,60 @@
> +Disable Optimization on vframeArray::unpack_to_stack
> +
> +GCC7 triggers a sigsegv while building:
> +
> +
> +|
> JAVA_HOME=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0
>
> ANT_OPTS=-Djava.io.tmpdir='/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools/build/ant-tmp'
>
> /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/recipe-sysroot-native/usr/bin/ant
> -Djdk.version=1.7.0_03 -Dfull.version='1.7.0_03-icedtea-b21'
> -Drelease=1.7.0_03 -Dbuild.number=b21 -Djavac.debug=true
> -Ddebug.classfiles=true -Djavac.target=7 -Djavac.source=7
> -Dboot.java.home=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0
>
> -Dimport.jdk=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/jdk
>
> +| Buildfile:
> /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/langtools/make/build.xml
> +| #
> +| # A fatal error has been detected by the Java Runtime Environment:
> +| #
> +| # SIGSEGV (0xb) at pc=0x7fad7906e868, pid=9747, tid=140383055484672
> +| #
> +| # JRE version: 7.0_03-b21
> +| # Java VM: OpenJDK 64-Bit Server VM (22.0-b10 mixed mode linux-amd64
> compressed oops)
> +| # Derivative: IcedTea7 2.1.3
> +| # Distribution: Custom build (Thu Sep 7 09:36:21 CEST 2017)
> +| # Problematic frame:
> +| # V [libjvm.so+0x78b868] vframeArray::unpack_to_stack(frame&, int,
> int)+0x88
> +| #
> +| # Failed to write core dump. Core dumps have been disabled. To enable core
> dumping, try "ulimit -c unlimited" before starting Java again
> +| #
> +| # An error report file with more information is saved as:
> +| #
> /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/langtools/make/hs_err_pid9747.log
> +| #
> +| # If you would like to submit a bug report, please include
> +| # instructions on how to reproduce the bug and visit:
> +| # http://icedtea.classpath.org/bugzilla
> +| #
> +| Aborted
> +
> +
> +Upstream-Status: Inappropriate
> +
> +Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
> +diff --git a/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
> b/build/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
> +index 52b080999224..81b6a09ea91a 100644
> +--- a/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
> b/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
> +@@ -500,7 +500,7 @@ void vframeArray::fill_in(JavaThread* thread,
> + }
> + }
> +
> +-void vframeArray::unpack_to_stack(frame _frame, int exec_mode, int
> caller_actual_param
[oe] [meta-java][PATCH] openjdk-8-common: Fix warning evaluating CFLAGS
Code is (on my opinion) simpler, making use of the dumpversion flag, instead of
calling the pre-processor via a pipe.
Flag has been tested on both clang gcc:
ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-4.8 -dumpversion
4.8
ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-4.9 -dumpversion
4.9.3
ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-5 -dumpversion
5.4.1
ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-6 -dumpversion
6.4.0
ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-7 -dumpversion
7
ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ clang-4.0
-dumpversion
4.2.1
Without this patch:
WARNING:
/home/ricardo/curro/qt5022/build-qt5022-pyro/repo/yocto/../java/recipes-core/openjdk/openjdk-8-native_102b14.bb:
Unable to export ${CXXFLAGS}: Failure expanding variable CXXFLAGS,
expression was
-isystem/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/recipe-sysroot-native/usr/include
-O2 -pipe -D_GLIBCXX_USE_CXX11_ABI=0 ${@version_specific_cflags(d)}
${@jdk_cpp_options(d)} which triggered exception IndexError: string
index out of range
WARNING:
/home/ricardo/curro/qt5022/build-qt5022-pyro/repo/yocto/../java/recipes-core/openjdk/openjdk-8-native_102b14.bb:
Unable to export ${CFLAGS}: Failure expanding variable CFLAGS,
expression was
-isystem/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/recipe-sysroot-native/usr/include
-O2 -pipe -Wno-error=deprecated-declarations
${@version_specific_cflags(d)} ${@jdk_cpp_options(d)} which triggered
exception IndexError: string index out of range
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
recipes-core/openjdk/openjdk-8-common.inc | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/recipes-core/openjdk/openjdk-8-common.inc
b/recipes-core/openjdk/openjdk-8-common.inc
index 0c5c2c3e3d2f..83828e156fb6 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -238,13 +238,9 @@ def version_specific_cflags(d):
if bb.data.inherits_class('native', d):
from subprocess import Popen, PIPE
-cmd = d.expand('${CPP} -P -').split()
-cc = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
-# This check is GCC specific. Clang always returns 4. For Clang
-# __clang_major__ and __clang_minor__ need to be checked. Ideally
-# __GNUC_MINOR__ would be checked as well, but for this recipe
-# GCC major is all we care about.
-version = cc.communicate(b'__GNUC__')[0].decode('utf-8')[0]
+cmd = d.expand('${CC} -dumpversion').split()
+cc = Popen(cmd, stdout=PIPE, stderr=PIPE)
+version = cc.communicate()[0].decode('utf-8')[0]
else:
# in the cross case, trust that GCCVERSION is correct. This won't
# work if the native toolchain is Clang, but as of this writing that
--
2.14.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 2/2] openjdk-8-native: Fix sigsegv with gcc7
OpenJDK does not build properly with GCC7. Add the same workaround that
we have for GCC6.
Without this patch:
| #
| # A fatal error has been detected by the Java Runtime Environment:
| #
| # SIGSEGV (0xb) at pc=0x7fcad0efcd5b, pid=17206, tid=0x7fcab264c700
| #
| # JRE version: OpenJDK Runtime Environment (8.0_102-b14) (build
1.8.0_102-internal-b14)
| # Java VM: OpenJDK 64-Bit Server VM (25.102-b14 mixed mode linux-amd64
compressed oops)
| # Problematic frame:
| # V [libjvm.so+0x78bd5b] Node::Node(unsigned int)+0x2b
| #
| # Failed to write core dump. Core dumps have been disabled. To enable core
dumping, try "ulimit -c unlimited" before starting Java again
| #
| # An error report file with more information is saved as:
| #
/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/build/hs_err_pid17206.log
| [thread 140508549912320 also had an error]
|
| [error occurred during error reporting , id 0xb]
|
| #
| # If you would like to submit a bug report, please visit:
| # http://bugreport.java.com/bugreport/crash.jsp
| #
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
recipes-core/openjdk/openjdk-8-common.inc | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/recipes-core/openjdk/openjdk-8-common.inc
b/recipes-core/openjdk/openjdk-8-common.inc
index def779db4d59..0c5c2c3e3d2f 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -218,10 +218,11 @@ EXTRA_OECONF_append = "\
--with-update-version=${OPENJDK_UPDATE_VERSION} \
"
-# GCC 6 sets the default C++ standard to C++14 and introduces dead store
-# elimination by default. OpenJDK 8 is not ready for either of these
-# changes.
+# Since v6, GCC sets the default C++ standard to C++14 and introduces
+# dead store elimination by default. OpenJDK 8 is not ready for either
+# of these changes.
FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
+FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
# All supported cross compilers support the compiler flags that were
# added to make compilation with gcc6 work. But the host compiler for
--
2.14.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 1/2] icedtea-native: Fix segmentation build during build
Without this patch, icedtea-native do_compile() results in a SIGSEGV
when compiled with GCC7
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
recipes-core/icedtea/icedtea7-native.inc | 2 +
.../openjdk-7-03b147/vframeArray_Fix_sigsegv.patch | 60 ++
2 files changed, 62 insertions(+)
create mode 100644
recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
diff --git a/recipes-core/icedtea/icedtea7-native.inc
b/recipes-core/icedtea/icedtea7-native.inc
index 55cb7e7a5024..7d625eb536ed 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -43,6 +43,7 @@ SRC_URI = " \
file://jaxws_fix_NullPointerException.patch;apply=no \
file://timezoneszip.patch \
file://sigsegv.patch;apply=no \
+ file://vframeArray_Fix_sigsegv.patch;apply=no \
"
S = "${WORKDIR}/${ICEDTEA}"
@@ -154,6 +155,7 @@ do_configure_append() {
patch -p1 < ${WORKDIR}/jaxws_fix_NullPointerException.patch
patch -p1 < ${WORKDIR}/sigsegv.patch
+ patch -p1 < ${WORKDIR}/vframeArray_Fix_sigsegv.patch
}
EXTRA_OEMAKE = ' \
diff --git
a/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
b/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
new file mode 100644
index ..62fe8b207011
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
@@ -0,0 +1,60 @@
+Disable Optimization on vframeArray::unpack_to_stack
+
+GCC7 triggers a sigsegv while building:
+
+
+|
JAVA_HOME=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0
ANT_OPTS=-Djava.io.tmpdir='/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools/build/ant-tmp'
/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/recipe-sysroot-native/usr/bin/ant
-Djdk.version=1.7.0_03 -Dfull.version='1.7.0_03-icedtea-b21'
-Drelease=1.7.0_03 -Dbuild.number=b21 -Djavac.debug=true
-Ddebug.classfiles=true -Djavac.target=7 -Djavac.source=7
-Dboot.java.home=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0
-Dimport.jdk=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/jdk
+| Buildfile:
/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/langtools/make/build.xml
+| #
+| # A fatal error has been detected by the Java Runtime Environment:
+| #
+| # SIGSEGV (0xb) at pc=0x7fad7906e868, pid=9747, tid=140383055484672
+| #
+| # JRE version: 7.0_03-b21
+| # Java VM: OpenJDK 64-Bit Server VM (22.0-b10 mixed mode linux-amd64
compressed oops)
+| # Derivative: IcedTea7 2.1.3
+| # Distribution: Custom build (Thu Sep 7 09:36:21 CEST 2017)
+| # Problematic frame:
+| # V [libjvm.so+0x78b868] vframeArray::unpack_to_stack(frame&, int,
int)+0x88
+| #
+| # Failed to write core dump. Core dumps have been disabled. To enable core
dumping, try "ulimit -c unlimited" before starting Java again
+| #
+| # An error report file with more information is saved as:
+| #
/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/langtools/make/hs_err_pid9747.log
+| #
+| # If you would like to submit a bug report, please include
+| # instructions on how to reproduce the bug and visit:
+| # http://icedtea.classpath.org/bugzilla
+| #
+| Aborted
+
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
+diff --git a/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
b/build/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
+index 52b080999224..81b6a09ea91a 100644
+--- a/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
b/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
+@@ -500,7 +500,7 @@ void vframeArray::fill_in(JavaThread* thread,
+ }
+ }
+
+-void vframeArray::unpack_to_stack(frame _frame, int exec_mode, int
caller_actual_parameters) {
++void __attribute__((optimize("O0"))) vframeArray::unpack_to_stack(frame
_frame, int exec_mode, int caller_actual_parameters) {
+ // stack picture
+ // unpack_frame
+ // [new interpreter frames ] (frames are skeletal but walkable)
+diff --git a/openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp
b/build/openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp
+index 52b080999224..81b6a09ea91a 100644
+--- a/openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp
b/openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp
+@@ -500,7 +500,7 @@ void vframeArray::fill_in(JavaThrea
[oe] icedtea7-native SIGSEGV build with gcc7
Hi!
After updating my computer to gcc7 (Debian testing) icedtea7-native
fails to build, resulting in a SIGSEGV in javac. (see the error
attached at the end)
After some google digging I found a possible reason for this error
https://bugzilla.redhat.com/show_bug.cgi?id=1423751 . But
BUILD_CFLAGS += "-fno-store-merging -fno-code-hoisting -fno-ipa-cp
-fno-ipa-vrp -fno-split-loops"
BUILD_CXXFLAGS += "-fno-store-merging -fno-code-hoisting -fno-ipa-cp
-fno-ipa-vrp -fno-split-loops"
did not do the trick.
On the other hand:
export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc-6"
export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++-6"
export BUILD_CPP = "${BUILD_PREFIX}gcc-6 ${BUILD_CC_ARCH} -E"
Managed to build icedtea7-native fine.
Has anyone experienced something similar?
Regards!
| (cd ./langtools/make && \
|
/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/sysroots/x86_64-linux/usr/bin/make
JDK_TOPDIR=/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/jdk
JDK_MAKE_SHARED_DIR=/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/jdk/make/common/shared
EXTERNALSANITYCONTROL=true SOURCE_LANGUAGE_VERSION=7
TARGET_CLASS_VERSION=7 MILESTONE=fcs BUILD_NUMBER=b21
JDK_BUILD_NUMBER=b21 FULL_VERSION=1.7.0_03-icedtea-b21
PREVIOUS_JDK_VERSION=1.6.0 JDK_VERSION=1.7.0_03 JDK_MKTG_VERSION=7u3
JDK_MAJOR_VERSION=1 JDK_MINOR_VERSION=7 JDK_MICRO_VERSION=0
PREVIOUS_MAJOR_VERSION=1 PREVIOUS_MINOR_VERSION=6
PREVIOUS_MICRO_VERSION=0 STATIC_CXX=false ARCH_DATA_MODEL=64
COOKED_JDK_UPDATE_VERSION=30 COOKED_BUILD_NUMBER=21
ALT_OUTPUTDIR=/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools
ALT_BOOTDIR=/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0
all)
| make[3]: Entering directory
'/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/langtools/make'
|
JAVA_HOME=/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0
ANT_OPTS=-Djava.io.tmpdir='/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools/build/ant-tmp'
/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/sysroots/x86_64-linux/usr/bin/ant
-diagnostics >
/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools/build/ant-diagnostics.log
; \
|
JAVA_HOME=/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0
ANT_OPTS=-Djava.io.tmpdir='/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools/build/ant-tmp'
/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/sysroots/x86_64-linux/usr/bin/ant
-version >>
/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools/build/ant-diagnostics.log
| Aborted
|
JAVA_HOME=/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0
ANT_OPTS=-Djava.io.tmpdir='/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools/build/ant-tmp'
/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/sysroots/x86_64-linux/usr/bin/ant
-Djdk.version=1.7.0_03 -Dfull.version='1.7.0_03-icedtea-b21'
-Drelease=1.7.0_03 -Dbuild.number=b21 -Djavac.debug=true
-Ddebug.classfiles=true -Djavac.target=7 -Djavac.source=7
-Dboot.java.home=/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0
-Dimport.jdk=/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/jdk
-Dbuild.dir=/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools/build
-Ddist.dir=/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools/dist
build
| Buildfile:
/var/lib/jenkins/workspace/qt5022-cesium-clean/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/langtools/make/build.xml
| #
| # A fatal error has been detected by the Java Runtime Environment:
| #
| # SIGSEGV (0xb) at pc=0x7f03929f0808, pid=26143,
[oe] Has anyone added support for bazel
Hi all I am working on adding support for TensorFlow in Openembbedded. One of the building dependencies is bazel ( https://bazel.build/ ) Before I create a recipe and a class I was wondering if anyone has already worked on this? Regards! Random Thought: Why dont we fix the current build systems that we have, instead of inventing new ones that require java? -- Ricardo Ribalda -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-clang][PATCH] lld_git: Only apply -stdlib flag to clang toolchain
GCC does not understand the stdlib flag. Resulting in this error during
configuration:
| x86_64-poky-linux-g++: error: unrecognized command line option
| '-stdlib=libc++'
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
recipes-devtools/clang/lld_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-devtools/clang/lld_git.bb
b/recipes-devtools/clang/lld_git.bb
index 5b31ff5fdbc8..31af909d25ad 100644
--- a/recipes-devtools/clang/lld_git.bb
+++ b/recipes-devtools/clang/lld_git.bb
@@ -34,7 +34,7 @@ OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
EXTRA_OECMAKE = "\
-DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
"
-CXXFLAGS += "-stdlib=libc++"
+CXXFLAGS_toolchain-clang += "-stdlib=libc++"
do_compile() {
cd ${B}/tools/lld
--
2.13.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-clang][PATCH] llvm-config: Fix implementation of --libs flag
llvm-config is called by mesa with the following parameters: llvm-config --libs liba libb libc libd . This result in an invalid call of llvm config: llvm-config --libs llvm-config liba llvm-config libb llvm-config libc Fix this use. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- recipes-devtools/clang/llvm-common/llvm-config | 4 1 file changed, 4 insertions(+) diff --git a/recipes-devtools/clang/llvm-common/llvm-config b/recipes-devtools/clang/llvm-common/llvm-config index 9fb14cb74cdc..4462896af6e2 100644 --- a/recipes-devtools/clang/llvm-common/llvm-config +++ b/recipes-devtools/clang/llvm-common/llvm-config @@ -14,6 +14,10 @@ if [[ $# == 0 ]]; then exec "$NEXT_LLVM_CONFIG" fi +if [[ $1 == "--libs" ]]; then + exec "$NEXT_LLVM_CONFIG" $@ +fi + for arg in "$@"; do case "$arg" in --cppflags) -- 2.13.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-clang][PATCH] clang: Allow user to add extra build target on class_target
Originally TARGETS_TO_BUILD was limited to the target architecture,
which is not enough to build code for heterogenous systems such as (in
my case) AMDGPU.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
recipes-devtools/clang/clang_git.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/recipes-devtools/clang/clang_git.bb
b/recipes-devtools/clang/clang_git.bb
index 01ad644a01a5..6c7de15c480b 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -62,6 +62,9 @@ PACKAGECONFIG[libcplusplus] =
"-DCLANG_DEFAULT_CXX_STDLIB=libc++,,libcxx"
LLVM_TARGETS_TO_BUILD ?= "AArch64;ARM;Mips;PowerPC;X86"
LLVM_TARGETS_TO_BUILD_append = ";${@get_clang_host_arch(bb,
d)};${@get_clang_target_arch(bb, d)}"
+LLVM_TARGETS_TO_BUILD_TARGET ?= ""
+LLVM_TARGETS_TO_BUILD_TARGET_append ?= "${@get_clang_target_arch(bb, d)}"
+
EXTRA_OECMAKE="-DLLVM_ENABLE_RTTI=True \
-DLLVM_ENABLE_EH=True \
-DLLVM_ENABLE_FFI=False \
@@ -84,7 +87,7 @@ EXTRA_OECMAKE_append_class-target = "\
-DLLVM_ENABLE_PIC=ON \
-DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
-DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
- -DLLVM_TARGETS_TO_BUILD=${@get_clang_target_arch(bb, d)} \
+ -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD_TARGET}' \
-DLLVM_TARGET_ARCH=${@get_clang_target_arch(bb, d)} \
-DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS} \
"
--
2.13.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-clang][PATCH] clang: Fix name of .so file
When we are building an unreleased version the so name is:
libLLVM-MAJOR.MINORsvn.so
instead of just
libLLVM-MAJOR.MINOR.so
E.g.:
libLLVM-5.0svn.so
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
recipes-devtools/clang/clang_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-devtools/clang/clang_git.bb
b/recipes-devtools/clang/clang_git.bb
index 6c7de15c480b..6690966085d9 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -131,6 +131,7 @@ FILES_${PN} += "\
FILES_${PN}-libllvm += "\
${libdir}/libLLVM-${MAJOR_VER}.${MINOR_VER}.so \
+ ${libdir}/libLLVM-${MAJOR_VER}.${MINOR_VER}svn.so \
"
FILES_${PN}-dev += "\
--
2.13.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] llvm-config: Fix implementation of --libs flag
llvm-config is called by mesa with the following parameters: llvm-config --libs liba libb libc libd . This result in an invalid call of llvm config: llvm-config --libs llvm-config liba llvm-config libb llvm-config libc Fix this use. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- recipes-devtools/clang/llvm-common/llvm-config | 4 1 file changed, 4 insertions(+) diff --git a/recipes-devtools/clang/llvm-common/llvm-config b/recipes-devtools/clang/llvm-common/llvm-config index 9fb14cb74cdc..4462896af6e2 100644 --- a/recipes-devtools/clang/llvm-common/llvm-config +++ b/recipes-devtools/clang/llvm-common/llvm-config @@ -14,6 +14,10 @@ if [[ $# == 0 ]]; then exec "$NEXT_LLVM_CONFIG" fi +if [[ $1 == "--libs" ]]; then + exec "$NEXT_LLVM_CONFIG" $@ +fi + for arg in "$@"; do case "$arg" in --cppflags) -- 2.13.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] clang: Fix name of .so file
When we are building an unreleased version the so name is:
libLLVM-MAJOR.MINORsvn.so
instead of just
libLLVM-MAJOR.MINOR.so
E.g.:
libLLVM-5.0svn.so
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
recipes-devtools/clang/clang_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-devtools/clang/clang_git.bb
b/recipes-devtools/clang/clang_git.bb
index 6c7de15c480b..6690966085d9 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -131,6 +131,7 @@ FILES_${PN} += "\
FILES_${PN}-libllvm += "\
${libdir}/libLLVM-${MAJOR_VER}.${MINOR_VER}.so \
+ ${libdir}/libLLVM-${MAJOR_VER}.${MINOR_VER}svn.so \
"
FILES_${PN}-dev += "\
--
2.13.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] lld_git: Only apply -stdlib flag to clang toolchain
GCC does not understand the stdlib flag. Resulting in this error during
configuration:
| x86_64-poky-linux-g++: error: unrecognized command line option
| '-stdlib=libc++'
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
recipes-devtools/clang/lld_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-devtools/clang/lld_git.bb
b/recipes-devtools/clang/lld_git.bb
index 5b31ff5fdbc8..31af909d25ad 100644
--- a/recipes-devtools/clang/lld_git.bb
+++ b/recipes-devtools/clang/lld_git.bb
@@ -34,7 +34,7 @@ OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
EXTRA_OECMAKE = "\
-DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
"
-CXXFLAGS += "-stdlib=libc++"
+CXXFLAGS_toolchain-clang += "-stdlib=libc++"
do_compile() {
cd ${B}/tools/lld
--
2.13.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] clang: Allow user to add extra build target on class_target
Originally TARGETS_TO_BUILD was limited to the target architecture,
which is not enough to build code for heterogenous systems such as (in
my case) AMDGPU.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
recipes-devtools/clang/clang_git.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/recipes-devtools/clang/clang_git.bb
b/recipes-devtools/clang/clang_git.bb
index 01ad644a01a5..6c7de15c480b 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -62,6 +62,9 @@ PACKAGECONFIG[libcplusplus] =
"-DCLANG_DEFAULT_CXX_STDLIB=libc++,,libcxx"
LLVM_TARGETS_TO_BUILD ?= "AArch64;ARM;Mips;PowerPC;X86"
LLVM_TARGETS_TO_BUILD_append = ";${@get_clang_host_arch(bb,
d)};${@get_clang_target_arch(bb, d)}"
+LLVM_TARGETS_TO_BUILD_TARGET ?= ""
+LLVM_TARGETS_TO_BUILD_TARGET_append ?= "${@get_clang_target_arch(bb, d)}"
+
EXTRA_OECMAKE="-DLLVM_ENABLE_RTTI=True \
-DLLVM_ENABLE_EH=True \
-DLLVM_ENABLE_FFI=False \
@@ -84,7 +87,7 @@ EXTRA_OECMAKE_append_class-target = "\
-DLLVM_ENABLE_PIC=ON \
-DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
-DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
- -DLLVM_TARGETS_TO_BUILD=${@get_clang_target_arch(bb, d)} \
+ -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD_TARGET}' \
-DLLVM_TARGET_ARCH=${@get_clang_target_arch(bb, d)} \
-DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS} \
"
--
2.13.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] meson: Port pkgconfig-native patch to 0.40.1
The update to 0.40.1 did not add this patch required for qt builds.
Fixes: 163abe723deb ("meson: update Meson devtool to 0.40.1")
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
.../meson/meson/native_bindir.patch| 71 ++
meta-oe/recipes-devtools/meson/meson_0.40.1.bb | 1 +
2 files changed, 72 insertions(+)
create mode 100644 meta-oe/recipes-devtools/meson/meson/native_bindir.patch
diff --git a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
new file mode 100644
index ..993e9750e33e
--- /dev/null
+++ b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
@@ -0,0 +1,71 @@
+There are some discussions upstream to merge this patch, but I presonaly
believe
+that is is OE only.
https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
+diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py
+index 04a22f985941..3e33bc4a79e7 100644
+--- a/mesonbuild/dependencies.py
b/mesonbuild/dependencies.py
+@@ -95,7 +95,7 @@ class Dependency:
+ def need_threads(self):
+ return False
+
+-def get_pkgconfig_variable(self, variable_name):
++def get_pkgconfig_variable(self, variable_name, use_native=False):
+ raise MesonException('Tried to get a pkg-config variable from a
non-pkgconfig dependency.')
+
+ class InternalDependency(Dependency):
+@@ -224,8 +224,12 @@ class PkgConfigDependency(Dependency):
+ return s.format(self.__class__.__name__, self.name, self.is_found,
+ self.version_reqs)
+
+-def _call_pkgbin(self, args):
+-p, out = Popen_safe([self.pkgbin] + args, env=os.environ)[0:2]
++def _call_pkgbin(self, args, use_native=False):
++if use_native:
++pkgbin = [self.pkgbin + "-native"]
++else:
++pkgbin = [self.pkgbin]
++p, out = Popen_safe(pkgbin + args, env=os.environ)[0:2]
+ return p.returncode, out.strip()
+
+ def _set_cargs(self):
+@@ -259,8 +263,8 @@ class PkgConfigDependency(Dependency):
+ self.is_libtool = True
+ self.libs.append(lib)
+
+-def get_pkgconfig_variable(self, variable_name):
+-ret, out = self._call_pkgbin(['--variable=' + variable_name,
self.name])
++def get_pkgconfig_variable(self, variable_name, use_native=False):
++ret, out = self._call_pkgbin(['--variable=' + variable_name,
self.name], use_native=use_native)
+ variable = ''
+ if ret != 0:
+ if self.required:
+@@ -1091,7 +1095,7 @@ class QtBaseDependency(Dependency):
+ self.bindir = self.get_pkgconfig_host_bins(core)
+ if not self.bindir:
+ # If exec_prefix is not defined, the pkg-config file is broken
+-prefix = core.get_pkgconfig_variable('exec_prefix')
++prefix = core.get_pkgconfig_variable('exec_prefix',
use_native=True)
+ if prefix:
+ self.bindir = os.path.join(prefix, 'bin')
+
+@@ -1202,7 +1206,7 @@ class Qt5Dependency(QtBaseDependency):
+ QtBaseDependency.__init__(self, 'qt5', env, kwargs)
+
+ def get_pkgconfig_host_bins(self, core):
+-return core.get_pkgconfig_variable('host_bins')
++return core.get_pkgconfig_variable('host_bins', use_native=True)
+
+ class Qt4Dependency(QtBaseDependency):
+ def __init__(self, env, kwargs):
+@@ -1216,7 +1220,7 @@ class Qt4Dependency(QtBaseDependency):
+ applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
+ for application in applications:
+ try:
+-return
os.path.dirname(core.get_pkgconfig_variable('%s_location' % application))
++return
os.path.dirname(core.get_pkgconfig_variable('%s_location' % application,
use_native=True))
+ except MesonException:
+ pass
+
diff --git a/meta-oe/recipes-devtools/meson/meson_0.40.1.bb
b/meta-oe/recipes-devtools/meson/meson_0.40.1.bb
index ab54b8c79d29..14644ba9ba0a 100644
--- a/meta-oe/recipes-devtools/meson/meson_0.40.1.bb
+++ b/meta-oe/recipes-devtools/meson/meson_0.40.1.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = " \
git://github.com/mesonbuild/meson.git \
+file://native_bindir.patch \
"
SRCREV = "b25d3e4d3f2b4d37029a507cc089bdde643c6240"
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v2] javasqlite: Use BUILD_CC variable instead of cc
cc binary is not present in the sysroot-recipe, use the one pointed by
BUILD_CC
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
.../javasqlite/files/0001-fix-errors-during-cross-compile.patch | 2 +-
recipes-core/javasqlite/javasqlite_20150419.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch
b/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch
index fc0da704230e..7f423535dded 100644
--- a/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch
+++ b/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch
@@ -106,7 +106,7 @@ index aa46b24..c0fd87f 100644
- $(LIBTOOL) --mode=link $(HOSTCC) @HOST_CFLAGS@ $(SQLITE_INC) \
- $(SQLITE3_INC) -DHAVE_SQLITE2=@HAVE_SQLITE2@ \
- -DHAVE_SQLITE3=@HAVE_SQLITE3@ -o native/mkconst native/mkconst.c
-+ $(LIBTOOL) --mode=link $(HOSTCC) $(CFLAGS_HOST) -o native/mkconst
native/mkconst.c
++ $(LIBTOOL) --mode=link $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_LDFLAGS)
$(CFLAGS_HOST) -o native/mkconst native/mkconst.c
Makefile: Makefile.in configure config.status
./config.status
diff --git a/recipes-core/javasqlite/javasqlite_20150419.bb
b/recipes-core/javasqlite/javasqlite_20150419.bb
index d721d66cc6c7..f69fddee0d2c 100644
--- a/recipes-core/javasqlite/javasqlite_20150419.bb
+++ b/recipes-core/javasqlite/javasqlite_20150419.bb
@@ -7,7 +7,7 @@ That API is wrapped by methods in the SQLite.Database class."
LICENSE = "BSD"
SECTION = "application"
-PR = "r0"
+PE = "1"
SRC_URI = " \
http://www.ch-werner.de/javasqlite/${BPN}-${PV}.tar.gz \
file://0001-fix-errors-during-cross-compile.patch \
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH] icedtea7: Update checksums to latests upstream values
Appartently upstream has again changed the content of the files. Update to the latest version. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- recipes-core/icedtea/icedtea7-native_2.1.3.bb | 28 +++--- .../icedtea/openjdk-7-03b147/fix-checksums.patch | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/recipes-core/icedtea/icedtea7-native_2.1.3.bb b/recipes-core/icedtea/icedtea7-native_2.1.3.bb index df2b01b6af5d..7391c658d7b5 100644 --- a/recipes-core/icedtea/icedtea7-native_2.1.3.bb +++ b/recipes-core/icedtea/icedtea7-native_2.1.3.bb @@ -8,29 +8,29 @@ SRC_URI[iced.md5sum] = "200e74ad440f9c4bfa21cc2bd94b4325" SRC_URI[iced.sha256sum] = "1929e57eb6718d30735e1e04e9e129457f845f7d7a8404b2b028740d0779ddb6" HOTSPOT_CHANGESET = "a456d0771ba0" -SRC_URI[hotspot.md5sum] = "625d903e79e4f9aaf21cf98e369118e1" -SRC_URI[hotspot.sha256sum] = "69719a9657b15e6bef1bef137a15d830293091fbc46616fe8759e863ba904442" +SRC_URI[hotspot.md5sum] = "23c46cbb8e8a2e04dafa6ef63bc810c4" +SRC_URI[hotspot.sha256sum] = "09a64fca0beff0759ef1b461d63ed6a00e43032972781bb3a55e49d8b93f67d0" CORBA_CHANGESET = "79ee8535bc51" -SRC_URI[corba.md5sum] = "f9aae602c4d31203fcbf8dcfc5560ad9" -SRC_URI[corba.sha256sum] = "00bf0b0996484db3d0497345ca5b14db4ffb2288b6c7adf8a003b2eafc396fb2" +SRC_URI[corba.md5sum] = "0e04317a6a74fea66ecac51c6171413c" +SRC_URI[corba.sha256sum] = "f61dad8d484e4a9e645b7fb73da87bc44f9986a074629154f37ed46be05f5b84" JAXP_CHANGESET = "77e7219c7424" -SRC_URI[jaxp.md5sum] = "440258a557c3cf0d585304a04ab060b8" -SRC_URI[jaxp.sha256sum] = "bb4beb62fae52d0ff871aefd64ae54eaed8978bff87df1e23f1bfead40ceae6d" +SRC_URI[jaxp.md5sum] = "27ea9ad4c7a4c43eb1ccab8a0f365a50" +SRC_URI[jaxp.sha256sum] = "9cfbc0efaface20f7188870b9bf5b0ebc73d745cd9a49d013cd4e81ba223ccdc" JAXWS_CHANGESET = "d92eda447bca" -SRC_URI[jaxws.md5sum] = "52b1d409628184988ff0f1d1e4d0a853" -SRC_URI[jaxws.sha256sum] = "566778320a0fa18ca93427d6afadc8bd3e416fd8249f9ce88e37e215f9295335" +SRC_URI[jaxws.md5sum] = "4fb688cb0e2c703dfdedca187bb94070" +SRC_URI[jaxws.sha256sum] = "6d0858d46b68d6e8488e70d1675e5b656aeb4ef51e8ee4e330e77219f92c1c0c" JDK_CHANGESET = "d7ecb57d3c61" -SRC_URI[jdk.md5sum] = "db2a0f91f27ad7ebbc68db53691ca403" -SRC_URI[jdk.sha256sum] = "b24bf93559804610a6e1078bea94adcec1b2f818dd600b12304926f6e86c6747" +SRC_URI[jdk.md5sum] = "0e90a9d980d44998083343a3a7614bb5" +SRC_URI[jdk.sha256sum] = "11146763409098a42dd9896f3fb7e7324a58c5cff5298009eb347ad26abeed51" LANGTOOLS_CHANGESET = "fd2fdb20d858" -SRC_URI[langtools.md5sum] = "702becdfee546841ed038c79fa1a9909" -SRC_URI[langtools.sha256sum] = "10fee41a0cdd1b166ff78e6426430c76af0f2358d026c181d325af1e41646c34" +SRC_URI[langtools.md5sum] = "48335bb031d4c75e75823e2d70f17ef5" +SRC_URI[langtools.sha256sum] = "3a4039348aa49547fffa96563b77b704c72e2ac3ead2c132843ba1e9fe4dbad2" OPENJDK_CHANGESET = "f89009ada191" -SRC_URI[openjdk.md5sum] = "2bc941373ca4b033c9a25f972eec7858" -SRC_URI[openjdk.sha256sum] = "5efd8e66f18fcbf45527bcc74aa3e6ed11f66bc793c88e3841925c4acb4827ba" +SRC_URI[openjdk.md5sum] = "c26bbb33addfaeb14d28a1329b4b5a3e" +SRC_URI[openjdk.sha256sum] = "54a0ef02b56b265b4122324e08a33c42ececbf2a300ada260611e7b6ccdba96d" diff --git a/recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch b/recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch index d7d1eb678168..cf93221aab04 100644 --- a/recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch +++ b/recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch @@ -17,7 +17,7 @@ +JAXWS_SHA256SUM = 566778320a0fa18ca93427d6afadc8bd3e416fd8249f9ce88e37e215f9295335 +JDK_SHA256SUM = b24bf93559804610a6e1078bea94adcec1b2f818dd600b12304926f6e86c6747 +LANGTOOLS_SHA256SUM = 10fee41a0cdd1b166ff78e6426430c76af0f2358d026c181d325af1e41646c34 -+OPENJDK_SHA256SUM = 5efd8e66f18fcbf45527bcc74aa3e6ed11f66bc793c88e3841925c4acb4827ba ++OPENJDK_SHA256SUM = a7532b99d7e30a92e6eefbb68e41e5a0853ac8b037e43712fc2c4f2ccd8719ed CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH] javasqlite: Use BUILD_CC variable instead of cc
cc binary is not present in the sysroot-recipe, use the one pointed by
BUILD_CC
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
.../javasqlite/files/0001-fix-errors-during-cross-compile.patch | 2 +-
recipes-core/javasqlite/javasqlite_20150419.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch
b/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch
index fc0da704230e..7f423535dded 100644
--- a/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch
+++ b/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch
@@ -106,7 +106,7 @@ index aa46b24..c0fd87f 100644
- $(LIBTOOL) --mode=link $(HOSTCC) @HOST_CFLAGS@ $(SQLITE_INC) \
- $(SQLITE3_INC) -DHAVE_SQLITE2=@HAVE_SQLITE2@ \
- -DHAVE_SQLITE3=@HAVE_SQLITE3@ -o native/mkconst native/mkconst.c
-+ $(LIBTOOL) --mode=link $(HOSTCC) $(CFLAGS_HOST) -o native/mkconst
native/mkconst.c
++ $(LIBTOOL) --mode=link $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_LDFLAGS)
$(CFLAGS_HOST) -o native/mkconst native/mkconst.c
Makefile: Makefile.in configure config.status
./config.status
diff --git a/recipes-core/javasqlite/javasqlite_20150419.bb
b/recipes-core/javasqlite/javasqlite_20150419.bb
index d721d66cc6c7..5d664bf932c8 100644
--- a/recipes-core/javasqlite/javasqlite_20150419.bb
+++ b/recipes-core/javasqlite/javasqlite_20150419.bb
@@ -7,7 +7,7 @@ That API is wrapped by methods in the SQLite.Database class."
LICENSE = "BSD"
SECTION = "application"
-PR = "r0"
+PE = "r1"
SRC_URI = " \
http://www.ch-werner.de/javasqlite/${BPN}-${PV}.tar.gz \
file://0001-fix-errors-during-cross-compile.patch \
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH] java-library: Fix build with sysroot-components
Now each recipes has its own sysroot under its WORKDIR, it we ease the
jar files after prepare_recipe_sysroot we will erase the classpath.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
classes/java-library.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index 58d5a4041a9f..e21e667b7ac6 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -54,7 +54,7 @@ do_removebinaries() {
find ${WORKDIR} -name "*.class" -exec rm {} \;
}
-addtask removebinaries after do_unpack before do_patch
+addtask removebinaries after do_unpack before prepare_recipe_sysroot
do_install_append() {
oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES}
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] meson: Port pkgconfig-native patch to 0.40.1
The update to 0.40.1 did not add this patch required for qt builds.
Fixes: 163abe723deb ("meson: update Meson devtool to 0.40.1")
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
.../meson/meson/native_bindir.patch| 36 +++---
meta-oe/recipes-devtools/meson/meson_0.40.1.bb | 1 +
2 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
index 53eeff7b688b..bd99f760ecca 100644
--- a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
+++ b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
@@ -1,8 +1,8 @@
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py
-index da73a57b7ecd..22100f69c580 100644
+index 04a22f985941..3e33bc4a79e7 100644
--- a/mesonbuild/dependencies.py
+++ b/mesonbuild/dependencies.py
-@@ -65,7 +65,7 @@ class Dependency():
+@@ -95,7 +95,7 @@ class Dependency:
def need_threads(self):
return False
@@ -11,7 +11,7 @@ index da73a57b7ecd..22100f69c580 100644
raise MesonException('Tried to get a pkg-config variable from a
non-pkgconfig dependency.')
class InternalDependency(Dependency):
-@@ -177,8 +177,12 @@ class PkgConfigDependency(Dependency):
+@@ -224,8 +224,12 @@ class PkgConfigDependency(Dependency):
return s.format(self.__class__.__name__, self.name, self.is_found,
self.version_reqs)
@@ -23,10 +23,10 @@ index da73a57b7ecd..22100f69c580 100644
+else:
+pkgbin = [self.pkgbin]
+p, out = Popen_safe(pkgbin + args, env=os.environ)[0:2]
- return (p.returncode, out.strip())
+ return p.returncode, out.strip()
def _set_cargs(self):
-@@ -212,8 +216,8 @@ class PkgConfigDependency(Dependency):
+@@ -259,8 +263,8 @@ class PkgConfigDependency(Dependency):
self.is_libtool = True
self.libs.append(lib)
@@ -37,12 +37,8 @@ index da73a57b7ecd..22100f69c580 100644
variable = ''
if ret != 0:
if self.required:
-@@ -933,10 +937,10 @@ class QtBaseDependency(Dependency):
- corekwargs = {'required': 'false', 'silent': 'true'}
- core = PkgConfigDependency(self.qtpkgname + 'Core', env,
corekwargs)
- # Used by self.compilers_detect()
--self.bindir = core.get_pkgconfig_variable('host_bins')
-+self.bindir = core.get_pkgconfig_variable('host_bins',
use_native=True)
+@@ -1091,7 +1095,7 @@ class QtBaseDependency(Dependency):
+ self.bindir = self.get_pkgconfig_host_bins(core)
if not self.bindir:
# If exec_prefix is not defined, the pkg-config file is broken
-prefix = core.get_pkgconfig_variable('exec_prefix')
@@ -50,3 +46,21 @@ index da73a57b7ecd..22100f69c580 100644
if prefix:
self.bindir = os.path.join(prefix, 'bin')
+@@ -1202,7 +1206,7 @@ class Qt5Dependency(QtBaseDependency):
+ QtBaseDependency.__init__(self, 'qt5', env, kwargs)
+
+ def get_pkgconfig_host_bins(self, core):
+-return core.get_pkgconfig_variable('host_bins')
++return core.get_pkgconfig_variable('host_bins', use_native=True)
+
+ class Qt4Dependency(QtBaseDependency):
+ def __init__(self, env, kwargs):
+@@ -1216,7 +1220,7 @@ class Qt4Dependency(QtBaseDependency):
+ applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
+ for application in applications:
+ try:
+-return
os.path.dirname(core.get_pkgconfig_variable('%s_location' % application))
++return
os.path.dirname(core.get_pkgconfig_variable('%s_location' % application,
use_native=True))
+ except MesonException:
+ pass
+
diff --git a/meta-oe/recipes-devtools/meson/meson_0.40.1.bb
b/meta-oe/recipes-devtools/meson/meson_0.40.1.bb
index a2c5e4d39719..fd96b4238eea 100644
--- a/meta-oe/recipes-devtools/meson/meson_0.40.1.bb
+++ b/meta-oe/recipes-devtools/meson/meson_0.40.1.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = " \
git://github.com/mesonbuild/meson.git \
+file://native_bindir.patch \
"
SRCREV = "b25d3e4d3f2b4d37029a507cc089bdde643c6240"
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] meson: Suport for c++ cross-compilation
cpp_args and cpp_link_args must be set on the meson.cross file to
compile c++ applications. Otherwise variables such as the sysroot
are not set correctly and libraries/headers are not found.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
meta-oe/classes/meson.bbclass | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/classes/meson.bbclass b/meta-oe/classes/meson.bbclass
index e27ed3906e41..c33174a21821 100644
--- a/meta-oe/classes/meson.bbclass
+++ b/meta-oe/classes/meson.bbclass
@@ -61,7 +61,9 @@ pkgconfig = 'pkg-config'
[properties]
c_args = [${@meson_array('MESON_C_ARGS', d)}]
+cpp_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}]
c_link_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}]
+cpp_link_args = [${@meson_array('TOOLCHAIN_OPTIONS', d)}]
[host_machine]
system = '${HOST_OS}'
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] meson: Use pkgconfig-native for the native tools
QT relies on host compilers such mas mocc. Modify meson to use
pkgconfig-native instead of pkgconfig in such cases.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
.../meson/meson/native_bindir.patch| 52 ++
meta-oe/recipes-devtools/meson/meson_0.37.1.bb | 5 ++-
2 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-devtools/meson/meson/native_bindir.patch
diff --git a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
new file mode 100644
index ..53eeff7b688b
--- /dev/null
+++ b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
@@ -0,0 +1,52 @@
+diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py
+index da73a57b7ecd..22100f69c580 100644
+--- a/mesonbuild/dependencies.py
b/mesonbuild/dependencies.py
+@@ -65,7 +65,7 @@ class Dependency():
+ def need_threads(self):
+ return False
+
+-def get_pkgconfig_variable(self, variable_name):
++def get_pkgconfig_variable(self, variable_name, use_native=False):
+ raise MesonException('Tried to get a pkg-config variable from a
non-pkgconfig dependency.')
+
+ class InternalDependency(Dependency):
+@@ -177,8 +177,12 @@ class PkgConfigDependency(Dependency):
+ return s.format(self.__class__.__name__, self.name, self.is_found,
+ self.version_reqs)
+
+-def _call_pkgbin(self, args):
+-p, out = Popen_safe([self.pkgbin] + args, env=os.environ)[0:2]
++def _call_pkgbin(self, args, use_native=False):
++if use_native:
++pkgbin = [self.pkgbin + "-native"]
++else:
++pkgbin = [self.pkgbin]
++p, out = Popen_safe(pkgbin + args, env=os.environ)[0:2]
+ return (p.returncode, out.strip())
+
+ def _set_cargs(self):
+@@ -212,8 +216,8 @@ class PkgConfigDependency(Dependency):
+ self.is_libtool = True
+ self.libs.append(lib)
+
+-def get_pkgconfig_variable(self, variable_name):
+-ret, out = self._call_pkgbin(['--variable=' + variable_name,
self.name])
++def get_pkgconfig_variable(self, variable_name, use_native=False):
++ret, out = self._call_pkgbin(['--variable=' + variable_name,
self.name], use_native=use_native)
+ variable = ''
+ if ret != 0:
+ if self.required:
+@@ -933,10 +937,10 @@ class QtBaseDependency(Dependency):
+ corekwargs = {'required': 'false', 'silent': 'true'}
+ core = PkgConfigDependency(self.qtpkgname + 'Core', env,
corekwargs)
+ # Used by self.compilers_detect()
+-self.bindir = core.get_pkgconfig_variable('host_bins')
++self.bindir = core.get_pkgconfig_variable('host_bins',
use_native=True)
+ if not self.bindir:
+ # If exec_prefix is not defined, the pkg-config file is broken
+-prefix = core.get_pkgconfig_variable('exec_prefix')
++prefix = core.get_pkgconfig_variable('exec_prefix',
use_native=True)
+ if prefix:
+ self.bindir = os.path.join(prefix, 'bin')
+
diff --git a/meta-oe/recipes-devtools/meson/meson_0.37.1.bb
b/meta-oe/recipes-devtools/meson/meson_0.37.1.bb
index a83af77b3ab6..dbbea6447605 100644
--- a/meta-oe/recipes-devtools/meson/meson_0.37.1.bb
+++ b/meta-oe/recipes-devtools/meson/meson_0.37.1.bb
@@ -4,7 +4,10 @@ SUMMARY = "A high performance build system"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/mesonbuild/meson.git"
+SRC_URI = " \
+git://github.com/mesonbuild/meson.git \
+file://native_bindir.patch \
+"
SRCREV = "3d4bfdcb22314ea7db45a5b075f8b2a9c1498aab"
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] opencv: Configure freetype via PACKAGECONFIG
Hi Raj On Fri, Jan 27, 2017 at 9:07 PM, Khem Raj <raj.k...@gmail.com> wrote: > > > On 1/27/17 7:21 AM, Ricardo Ribalda Delgado wrote: >> Since: http://errors.yoctoproject.org/Errors/Details/117456/ opencv >> freetype module fails to build. >> > > I wonder if we need to export RANLIB in configure > along with CC and CXX I would definitely like to try that out, but I am out of the office until the 15th. If you do not want to wait for me, you are more than welcome to send a patch. If I keep sending patched during our holidays my wife will have a valid excuse to escape with the barman :) Regards! -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] opencv: Configure freetype via PACKAGECONFIG
Since: http://errors.yoctoproject.org/Errors/Details/117456/ opencv freetype module fails to build. This patch disables that module by default via PACKAGECONFIG until we find out a better way to do it. Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com> --- meta-oe/recipes-support/opencv/opencv_3.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/opencv/opencv_3.2.bb b/meta-oe/recipes-support/opencv/opencv_3.2.bb index f18aa796f9aa..f47347ab4455 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.2.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.2.bb @@ -61,6 +61,7 @@ PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libcl PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DUPDATE_PROTO_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,lapack protobuf protobuf-native," PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," +PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 2/2] opencv: Update to version 3.2
Hi Martin On Thu, Jan 19, 2017 at 12:45 PM, Martin Jansa <martin.ja...@gmail.com> wrote: > On Thu, Dec 29, 2016 at 02:35:08PM +0100, Ricardo Ribalda Delgado wrote: >> -Only enable protobuf as dependency if dnn module is enabled >> -Download manually xfeatures from 3rd party repo >> -Remove uneeded fixgcc60patch > > Fails to build now: > http://errors.yoctoproject.org/Errors/Details/117456/ > I have not been able to replicate it in for qemux86. By looking at the error message it looks like something on the freetype module. Until we figure out what is going on, maybe we could pakcageconfig that module and disable it by default (it is part of contrib) What do you think? -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/2] opencv: Update to version 3.2
-Only enable protobuf as dependency if dnn module is enabled
-Download manually xfeatures from 3rd party repo
-Remove uneeded fixgcc60patch
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
...01-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | 2 +-
.../recipes-support/opencv/opencv/fixgcc60.patch | 30 --
.../opencv/opencv/uselocalxfeatures.patch | 12 +
.../opencv/opencv/useoeprotobuf.patch | 13 ++
.../opencv/{opencv_3.1.bb => opencv_3.2.bb}| 27 +++
5 files changed, 43 insertions(+), 41 deletions(-)
delete mode 100644 meta-oe/recipes-support/opencv/opencv/fixgcc60.patch
create mode 100644
meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
create mode 100644 meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch
rename meta-oe/recipes-support/opencv/{opencv_3.1.bb => opencv_3.2.bb} (87%)
diff --git
a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
index d568018b8d91..1077d05be5c6 100644
---
a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
+++
b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
@@ -17,7 +17,7 @@ index a6016dbe10bc..af4062c8e95e 100644
endif()
+ if(NOT DEFINED OPENCV_ICV_PATH)
- set(OPENCV_ICV_UNPACK_PATH "${CMAKE_CURRENT_LIST_DIR}/unpack")
+ set(OPENCV_ICV_UNPACK_PATH "${CMAKE_BINARY_DIR}/3rdparty/ippicv")
set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}")
+ endif()
diff --git a/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch
b/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch
deleted file mode 100644
index 5d0bf97cab63..
--- a/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
-index 28ccc1c6be4f..b0e1cbf77287 100644
a/cmake/OpenCVPCHSupport.cmake
-+++ b/cmake/OpenCVPCHSupport.cmake
-@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
- OUTPUT_VARIABLE gcc_compiler_version)
- #MESSAGE("GCC Version: ${gcc_compiler_version}")
--IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
-+IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version
VERSION_LESS "6.0.0")
- SET(PCHSupport_FOUND TRUE)
- ENDIF()
-
-diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
-index 3a23cd73633d..1fea1578b1d9 100644
a/cmake/OpenCVUtils.cmake
-+++ b/cmake/OpenCVUtils.cmake
-@@ -76,7 +76,11 @@ function(ocv_include_directories)
- if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}"
MATCHES "^${OpenCV_BINARY_DIR}")
- list(APPEND __add_before "${dir}")
- else()
-- include_directories(AFTER SYSTEM "${dir}")
-+ if (gcc_compiler_version VERSION_LESS "6.0.0")
-+ include_directories(AFTER SYSTEM "${dir}")
-+ else()
-+ include_directories(AFTER "${dir}")
-+ endif()
- endif()
- endforeach()
- include_directories(BEFORE ${__add_before})
diff --git a/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
b/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
new file mode 100644
index ..a2db48d7c907
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
@@ -0,0 +1,12 @@
+diff --git a/modules/xfeatures2d/CMakeLists.txt
b/modules/xfeatures2d/CMakeLists.txt
+index f295bddaed66..6086e75ec37b 100644
+--- a/modules/xfeatures2d/CMakeLists.txt
b/modules/xfeatures2d/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ set(the_description "Contributed/Experimental Algorithms for Salient 2D
Features Detection")
+ ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d
opencv_calib3d opencv_shape opencv_highgui opencv_videoio opencv_ml
+ OPTIONAL opencv_cudaarithm WRAP python java)
+-include(cmake/download_vgg.cmake)
+-include(cmake/download_boostdesc.cmake)
++#include(cmake/download_vgg.cmake)
++#include(cmake/download_boostdesc.cmake)
diff --git a/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch
b/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch
new file mode 100644
index ..3068bd44d878
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch
@@ -0,0 +1,13 @@
+diff --git a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake
b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake
+index eb2a729cc2eb..8717736484de 100644
+--- a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake
b/modules/dnn/cmake/OpenCVFindLi
[oe] [PATCH 1/2] protobuf: Update to latest version 3.1.0
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
.../protobuf/{protobuf_2.6.1.bb => protobuf_3.1.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-devtools/protobuf/{protobuf_2.6.1.bb =>
protobuf_3.1.0.bb} (83%)
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb
b/meta-oe/recipes-devtools/protobuf/protobuf_3.1.0.bb
similarity index 83%
rename from meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb
rename to meta-oe/recipes-devtools/protobuf/protobuf_3.1.0.bb
index 7b8f62986a41..18210b1e5c8f 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_2.6.1.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.1.0.bb
@@ -12,11 +12,11 @@ DEPENDS = "zlib"
RDEPENDS_${PN}-compiler = "${PN}"
RDEPENDS_${PN}-dev += "${PN}-compiler"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=af6809583bfde9a31595a58bb4a24514"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095"
-SRCREV = "bba83652e1be610bdb7ee1566ad18346d98b843c"
+SRCREV = "a428e42072765993ff674fda72863c9f1aa2d268"
-PV = "2.6.1+git${SRCPV}"
+PV = "3.1.0+git${SRCPV}"
SRC_URI = "git://github.com/google/protobuf.git"
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/4] gflags: Update to 2.2.0
Need to unset REGISTER_INSTALL_PREFIX to avoid:
WARNING: gflags-2.2.0-r0 do_package: QA Issue: gflags: Files/directories
were installed but not shipped in any package:
/home
/home/ricardo
/home/ricardo/.cmake
/home/ricardo/.cmake/packages
/home/ricardo/.cmake/packages/gflags
/home/ricardo/.cmake/packages/gflags/a7fca4708532331c2d656af0fdc8b8b9
Please set FILES such that these items are packaged. Alternatively if they
are unneeded, avoid installing them or delete them within do_install.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
meta-oe/recipes-support/gflags/{gflags_2.1.2.bb => gflags_2.2.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/gflags/{gflags_2.1.2.bb => gflags_2.2.0.bb}
(76%)
diff --git a/meta-oe/recipes-support/gflags/gflags_2.1.2.bb
b/meta-oe/recipes-support/gflags/gflags_2.2.0.bb
similarity index 76%
rename from meta-oe/recipes-support/gflags/gflags_2.1.2.bb
rename to meta-oe/recipes-support/gflags/gflags_2.2.0.bb
index da82599c7f1c..b9188c3124db 100644
--- a/meta-oe/recipes-support/gflags/gflags_2.1.2.bb
+++ b/meta-oe/recipes-support/gflags/gflags_2.2.0.bb
@@ -6,15 +6,15 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df"
SRC_URI = "https://github.com/gflags/gflags/archive/v${PV}.tar.gz;
-SRC_URI[md5sum] = "ac432de923f9de1e9780b5254884599f"
-SRC_URI[sha256sum] =
"d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662"
+SRC_URI[md5sum] = "b99048d9ab82d8c56e876fb1456c285e"
+SRC_URI[sha256sum] =
"466c36c6508a451734e4f4d76825cf9cd9b8716d2b70ef36479ae40f08271f88"
S = "${WORKDIR}/${PN}-${PV}/"
FILES_${PN}-dev += "${libdir}/cmake"
inherit cmake
-EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON"
+EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF"
PACKAGES =+ "${PN}-bash-completion"
FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh"
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/4] gflags: Fix fetch URL
Fixes:
ARNING: gflags-2.1.2-r0 do_fetch: Failed to fetch URL
git://github.com/gflags/gflags.git;branch=master, attempting MIRRORS if
available
ERROR: gflags-2.1.2-r0 do_fetch: Fetcher failure: Unable to find
revision 1a02f2851ee3d48d32d2c8f4d8f390a0bc25565c in branch master even
from upstream
ERROR: gflags-2.1.2-r0 do_fetch: Fetcher failure for URL:
'git://github.com/gflags/gflags.git;branch=master'. Unable to fetch URL
from any source
Signed-off-by: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
---
meta-oe/recipes-support/gflags/gflags_2.1.2.bb | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-support/gflags/gflags_2.1.2.bb
b/meta-oe/recipes-support/gflags/gflags_2.1.2.bb
index b5e0597989b5..da82599c7f1c 100644
--- a/meta-oe/recipes-support/gflags/gflags_2.1.2.bb
+++ b/meta-oe/recipes-support/gflags/gflags_2.1.2.bb
@@ -5,9 +5,10 @@ HOMEPAGE = "https://github.com/gflags/gflags;
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df"
-SRC_URI = "git://github.com/gflags/gflags.git;branch=release"
-SRCREV = "1a02f2851ee3d48d32d2c8f4d8f390a0bc25565c"
-S = "${WORKDIR}/git/"
+SRC_URI = "https://github.com/gflags/gflags/archive/v${PV}.tar.gz;
+SRC_URI[md5sum] = "ac432de923f9de1e9780b5254884599f"
+SRC_URI[sha256sum] =
"d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662"
+S = "${WORKDIR}/${PN}-${PV}/"
FILES_${PN}-dev += "${libdir}/cmake"
--
2.11.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
