* [meta-oe][PATCH 0/3] 3 fixes for multilib
@ 2015-06-04 7:48 Yi Zhao
2015-06-04 7:48 ` [meta-oe][PATCH 1/3] luajit: fix build failure " Yi Zhao
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Yi Zhao @ 2015-06-04 7:48 UTC (permalink / raw)
To: openembedded-devel
The following changes since commit 9a5d25f2a717814f948b492b9c01c1ff0edb678d:
pinpoint: use clutter-gst-3.0 (2015-05-28 10:35:35 +0200)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib yzhao/fixes-for-multilib
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=yzhao/fixes-for-multilib
Yi Zhao (3):
luajit: fix build failure for multilib
nodejs: fix build failure for multilib
llvm: fix libdir for multilib
meta-oe/recipes-core/llvm/llvm.inc | 9 ++++++++-
meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb | 4 ++--
meta-oe/recipes-devtools/nodejs/nodejs_0.12.4.bb | 9 +++------
3 files changed, 13 insertions(+), 9 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 7+ messages in thread* [meta-oe][PATCH 1/3] luajit: fix build failure for multilib
2015-06-04 7:48 [meta-oe][PATCH 0/3] 3 fixes for multilib Yi Zhao
@ 2015-06-04 7:48 ` Yi Zhao
2015-06-11 10:39 ` Martin Jansa
2015-06-04 7:48 ` [meta-oe][PATCH 2/3] nodejs: " Yi Zhao
2015-06-04 7:48 ` [meta-oe][PATCH 3/3] llvm: fix libdir " Yi Zhao
2 siblings, 1 reply; 7+ messages in thread
From: Yi Zhao @ 2015-06-04 7:48 UTC (permalink / raw)
To: openembedded-devel
Fix libdir in Makefile
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
index 48137e3..f3235c9 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
@@ -16,8 +16,8 @@ inherit pkgconfig binconfig
BBCLASSEXTEND = "native"
do_configure_prepend() {
- sed -i -e s:/usr/local:${prefix}:g ${S}/Makefile
- sed -i -e s:/lib$:${base_libdir}:g ${S}/Makefile
+ sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile
+ sed -i 's:MULTILIB= lib:MULTILIB= ${base_libdir}:g' ${S}/Makefile
}
EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [meta-oe][PATCH 1/3] luajit: fix build failure for multilib
2015-06-04 7:48 ` [meta-oe][PATCH 1/3] luajit: fix build failure " Yi Zhao
@ 2015-06-11 10:39 ` Martin Jansa
2015-06-12 8:14 ` Yi Zhao
0 siblings, 1 reply; 7+ messages in thread
From: Martin Jansa @ 2015-06-11 10:39 UTC (permalink / raw)
To: openembedded-devel
On Thu, Jun 04, 2015 at 03:48:11PM +0800, Yi Zhao wrote:
> Fix libdir in Makefile
>
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ---
> meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
> index 48137e3..f3235c9 100644
> --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
> +++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
> @@ -16,8 +16,8 @@ inherit pkgconfig binconfig
> BBCLASSEXTEND = "native"
>
> do_configure_prepend() {
> - sed -i -e s:/usr/local:${prefix}:g ${S}/Makefile
> - sed -i -e s:/lib$:${base_libdir}:g ${S}/Makefile
> + sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile
> + sed -i 's:MULTILIB= lib:MULTILIB= ${base_libdir}:g' ${S}/Makefile
> }
This seems to break qemux86 build
| ==== Successfully installed LuaJIT 2.0.3 to /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr ====
| rmdir: failed to remove `/home/jenkins/oe/world/shr-core/tmp-glibc/work/x86_64-linux/luajit-native/2.0.3-r0/image/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/lib/lua/5.*': No such file or directory
| rmdir: failed to remove `/home/jenkins/oe/world/shr-core/tmp-glibc/work/x86_64-linux/luajit-native/2.0.3-r0/image/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/lib/lua': No such file or directory
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_install (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/x86_64-linux/luajit-native/2.0.3-r0/temp/log.do_install.31954)
NOTE: recipe luajit-native-2.0.3-r0: task do_install: Failed
ERROR: Task 31965 (virtual:native:/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb, do_install) failed with exit code '1'
>
> EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \
> --
> 1.7.9.5
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [meta-oe][PATCH 1/3] luajit: fix build failure for multilib
2015-06-11 10:39 ` Martin Jansa
@ 2015-06-12 8:14 ` Yi Zhao
0 siblings, 0 replies; 7+ messages in thread
From: Yi Zhao @ 2015-06-12 8:14 UTC (permalink / raw)
To: openembedded-devel, martin.jansa
在 2015年06月11日 18:39, Martin Jansa 写道:
> On Thu, Jun 04, 2015 at 03:48:11PM +0800, Yi Zhao wrote:
>> Fix libdir in Makefile
>>
>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>> ---
>> meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
>> index 48137e3..f3235c9 100644
>> --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
>> +++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
>> @@ -16,8 +16,8 @@ inherit pkgconfig binconfig
>> BBCLASSEXTEND = "native"
>>
>> do_configure_prepend() {
>> - sed -i -e s:/usr/local:${prefix}:g ${S}/Makefile
>> - sed -i -e s:/lib$:${base_libdir}:g ${S}/Makefile
>> + sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile
>> + sed -i 's:MULTILIB= lib:MULTILIB= ${base_libdir}:g' ${S}/Makefile
>> }
> This seems to break qemux86 build
>
> | ==== Successfully installed LuaJIT 2.0.3 to /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr ====
> | rmdir: failed to remove `/home/jenkins/oe/world/shr-core/tmp-glibc/work/x86_64-linux/luajit-native/2.0.3-r0/image/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/lib/lua/5.*': No such file or directory
> | rmdir: failed to remove `/home/jenkins/oe/world/shr-core/tmp-glibc/work/x86_64-linux/luajit-native/2.0.3-r0/image/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/lib/lua': No such file or directory
> | WARNING: exit code 1 from a shell command.
> | ERROR: Function failed: do_install (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/x86_64-linux/luajit-native/2.0.3-r0/temp/log.do_install.31954)
> NOTE: recipe luajit-native-2.0.3-r0: task do_install: Failed
> ERROR: Task 31965 (virtual:native:/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb, do_install) failed with exit code '1'
>
Thanks, Martin. I can reproduce it. A patch will be sent later.
Yi
>>
>> EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \
>> --
>> 1.7.9.5
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 2/3] nodejs: fix build failure for multilib
2015-06-04 7:48 [meta-oe][PATCH 0/3] 3 fixes for multilib Yi Zhao
2015-06-04 7:48 ` [meta-oe][PATCH 1/3] luajit: fix build failure " Yi Zhao
@ 2015-06-04 7:48 ` Yi Zhao
2015-06-04 7:48 ` [meta-oe][PATCH 3/3] llvm: fix libdir " Yi Zhao
2 siblings, 0 replies; 7+ messages in thread
From: Yi Zhao @ 2015-06-04 7:48 UTC (permalink / raw)
To: openembedded-devel
bitbake nodejs
[snip]
sed: can't read /buildarea2/build/tmp/work/core2-64-poky-linux/nodejs/0.12.4-r0/image/usr/lib64/node_modules/npm/bin/npm-cli.js:
No such file or directory
[snip]
The node modules are not binary files. It doesn't make sense to install
them to /usr/lib64.
Use /usr/lib/node_modules instead of /usr/lib64/node_modules even on
multilib.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
meta-oe/recipes-devtools/nodejs/nodejs_0.12.4.bb | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.12.4.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.12.4.bb
index 4e1ba1f..81b8c0d 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_0.12.4.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.12.4.bb
@@ -61,20 +61,17 @@ do_install_append_class-native() {
# /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js
# use sed on npm-cli.js because otherwise symlink is replaced with normal file and
# npm-cli.js continues to use old shebang
- sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${libdir}/node_modules/npm/bin/npm-cli.js
+ sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
}
do_install_append_class-target() {
- sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${libdir}/node_modules/npm/bin/npm-cli.js
+ sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
}
PACKAGES =+ "${PN}-npm"
-FILES_${PN}-npm = "${libdir}/node_modules ${bindir}/npm"
+FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm"
RDEPENDS_${PN}-npm = "bash python-shell python-datetime python-subprocess python-textutils"
-PACKAGES =+ "${PN}-dtrace"
-FILES_${PN}-dtrace = "${libdir}/dtrace"
-
PACKAGES =+ "${PN}-systemtap"
FILES_${PN}-systemtap = "${datadir}/systemtap"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [meta-oe][PATCH 3/3] llvm: fix libdir for multilib
2015-06-04 7:48 [meta-oe][PATCH 0/3] 3 fixes for multilib Yi Zhao
2015-06-04 7:48 ` [meta-oe][PATCH 1/3] luajit: fix build failure " Yi Zhao
2015-06-04 7:48 ` [meta-oe][PATCH 2/3] nodejs: " Yi Zhao
@ 2015-06-04 7:48 ` Yi Zhao
2 siblings, 0 replies; 7+ messages in thread
From: Yi Zhao @ 2015-06-04 7:48 UTC (permalink / raw)
To: openembedded-devel
Fix the hardcoded libdir in llvm-config and Makefile.config
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
meta-oe/recipes-core/llvm/llvm.inc | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-core/llvm/llvm.inc b/meta-oe/recipes-core/llvm/llvm.inc
index 26bac33..0597be1 100644
--- a/meta-oe/recipes-core/llvm/llvm.inc
+++ b/meta-oe/recipes-core/llvm/llvm.inc
@@ -60,6 +60,9 @@ do_configure_prepend() {
sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" ${S}/tools/llvm-config/llvm-config.cpp
sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" ${S}/tools/llvm-config/llvm-config.cpp
+ # Fix the hardcoded libdir in llvm-config
+ sed -i 's:/lib\>:${base_libdir}:g' ${S}/tools/llvm-config/llvm-config.cpp
+
# Fails to build unless using separate directory from source
mkdir -p ${LLVM_BUILD_DIR}
cd ${LLVM_BUILD_DIR}
@@ -67,6 +70,10 @@ do_configure_prepend() {
do_compile() {
cd ${LLVM_BUILD_DIR}
+
+ # Fix libdir for multilib
+ sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)${base_libdir}:g' Makefile.config
+
oe_runmake \
AR="${BUILD_AR}" \
CC="${BUILD_CC}" \
@@ -127,7 +134,7 @@ FILES_${PN}-dev = "${bindir}/${LLVM_DIR} \
PACKAGES_DYNAMIC = "^libllvm-.*$"
-INSANE_SKIP_libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE} += "dev-so"
+INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE} += "dev-so"
python llvm_populate_packages() {
libdir = bb.data.expand('${libdir}', d)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 0/3] 3 fixes for multilib
@ 2015-09-18 9:10 Yi Zhao
0 siblings, 0 replies; 7+ messages in thread
From: Yi Zhao @ 2015-09-18 9:10 UTC (permalink / raw)
To: openembedded-devel
The following changes since commit 1692d5c3020434404fc1ee6911a60b88287a5efb:
netmap: add new package (2015-09-15 10:49:30 -0400)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib yzhao/multilib-fixes
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=yzhao/multilib-fixes
Yi Zhao (3):
sblim-sfcCommon: fix ${PN}-${PV} -> ${BP} for multilib
sblim-sfcb: fix ${PN}-${PV} -> ${BP} for multilib
mailcap: fix PN -> BPN for multilib
.../sblim-sfcCommon/sblim-sfcCommon_1.0.1.bb | 2 +-
.../sblim-sfcb/sblim-sfcb_1.4.8.bb | 2 +-
meta-oe/recipes-support/mailcap/mailcap_2.1.44.bb | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-09-18 9:11 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-04 7:48 [meta-oe][PATCH 0/3] 3 fixes for multilib Yi Zhao
2015-06-04 7:48 ` [meta-oe][PATCH 1/3] luajit: fix build failure " Yi Zhao
2015-06-11 10:39 ` Martin Jansa
2015-06-12 8:14 ` Yi Zhao
2015-06-04 7:48 ` [meta-oe][PATCH 2/3] nodejs: " Yi Zhao
2015-06-04 7:48 ` [meta-oe][PATCH 3/3] llvm: fix libdir " Yi Zhao
-- strict thread matches above, loose matches on Subject: below --
2015-09-18 9:10 [meta-oe][PATCH 0/3] 3 fixes " Yi Zhao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.