* [PATCH 1/4] musl: Drop the protected symbol optimization at configure time
@ 2017-08-01 13:55 Khem Raj
2017-08-01 13:55 ` [PATCH 2/4] mesa: Use chrpath to delete rpaths Khem Raj
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Khem Raj @ 2017-08-01 13:55 UTC (permalink / raw)
To: openembedded-core
lld and gold can not handle it and treat it wrong
Fixes
[YOCTO #11689]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/musl/musl_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 53a8ba196a..93e3535c8d 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -36,6 +36,7 @@ CONFIGUREOPTS = " \
--libdir=${libdir} \
--includedir=${includedir} \
--syslibdir=${base_libdir} \
+ --disable-visibility \
"
do_configure() {
--
2.13.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] mesa: Use chrpath to delete rpaths
2017-08-01 13:55 [PATCH 1/4] musl: Drop the protected symbol optimization at configure time Khem Raj
@ 2017-08-01 13:55 ` Khem Raj
2017-08-01 13:55 ` [PATCH 3/4] mesa: Depend on llvm-native Khem Raj
2017-08-01 13:55 ` [PATCH V2 4/4] mesa, llvm: Use native version of llvm-config Khem Raj
2 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2017-08-01 13:55 UTC (permalink / raw)
To: openembedded-core
It adds native sysroot chrpath due to llvm-config in cross compiling
we can delete them via chrpath, since libs are in standard paths rpath
is really not needed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-graphics/mesa/mesa.inc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index c9b67d4966..da449fa70b 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c
PE = "2"
-DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib"
-
+DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native"
+EXTRANATIVEPATH += "chrpath-native"
PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa"
inherit autotools pkgconfig gettext distro_features_check
@@ -118,9 +118,10 @@ do_install_append () {
rm -f ${D}${libdir}/egl/*.la
rm -f ${D}${libdir}/gallium-pipe/*.la
rm -f ${D}${libdir}/gbm/*.la
-
+
# it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
rm -f ${D}${sysconfdir}/drirc
+ chrpath --delete ${D}${libdir}/dri/*_dri.so
}
# For the packages that make up the OpenGL interfaces, inject variables so that
--
2.13.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] mesa: Depend on llvm-native
2017-08-01 13:55 [PATCH 1/4] musl: Drop the protected symbol optimization at configure time Khem Raj
2017-08-01 13:55 ` [PATCH 2/4] mesa: Use chrpath to delete rpaths Khem Raj
@ 2017-08-01 13:55 ` Khem Raj
2017-08-01 13:55 ` [PATCH V2 4/4] mesa, llvm: Use native version of llvm-config Khem Raj
2 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2017-08-01 13:55 UTC (permalink / raw)
To: openembedded-core
We need to get llvm-config tool staged which is provided by llvm-native
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-graphics/mesa/mesa.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index da449fa70b..e14372775b 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -75,7 +75,7 @@ GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-l
# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
MESA_LLVM_RELEASE ?= "5.0"
-PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} \
+PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \
${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
PACKAGECONFIG[xa] = "--enable-xa, --disable-xa"
--
2.13.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V2 4/4] mesa, llvm: Use native version of llvm-config
2017-08-01 13:55 [PATCH 1/4] musl: Drop the protected symbol optimization at configure time Khem Raj
2017-08-01 13:55 ` [PATCH 2/4] mesa: Use chrpath to delete rpaths Khem Raj
2017-08-01 13:55 ` [PATCH 3/4] mesa: Depend on llvm-native Khem Raj
@ 2017-08-01 13:55 ` Khem Raj
2 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2017-08-01 13:55 UTC (permalink / raw)
To: openembedded-core
We have a variable YOCTO_ALTERNATE_EXE_PATH to point to
target sysroot, utilize this in mesa to use native version
of llvm-config to report values from target sysroot.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/llvm/llvm_git.bb | 16 +++++++++-------
meta/recipes-graphics/mesa/mesa.inc | 4 ++--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index 5dcb508c23..722bc53aa1 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -67,12 +67,12 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
EXTRA_OECMAKE_append_class-target = "\
-DCMAKE_CROSSCOMPILING:BOOL=ON \
- -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
+ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen${PV} \
"
EXTRA_OECMAKE_append_class-nativesdk = "\
-DCMAKE_CROSSCOMPILING:BOOL=ON \
- -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
+ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen${PV} \
"
do_configure_prepend() {
@@ -87,12 +87,12 @@ do_compile() {
}
do_compile_class-native() {
- NINJA_STATUS="[%p] " ninja -v ${PARALLEL_MAKE} llvm-tblgen
+ NINJA_STATUS="[%p] " ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen
}
do_install() {
NINJA_STATUS="[%p] " DESTDIR=${LLVM_INSTALL_DIR} ninja -v install
- install -D -m 0755 ${B}/NATIVE/bin/llvm-config ${D}${libdir}/${LLVM_DIR}/llvm-config-host
+ install -D -m 0755 ${B}/bin/llvm-config ${D}${libdir}/${LLVM_DIR}/llvm-config
install -d ${D}${bindir}/${LLVM_DIR}
cp -r ${LLVM_INSTALL_DIR}${bindir}/* ${D}${bindir}/${LLVM_DIR}/
@@ -121,7 +121,9 @@ do_install() {
rm -rf ${D}${libdir}/${LLVM_DIR}/libLTO.so
}
do_install_class-native() {
- install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen
+ install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen${PV}
+ install -D -m 0755 ${B}/bin/llvm-config ${D}${bindir}/llvm-config${PV}
+ install -D -m 0755 ${B}/lib/libLLVM-${PV}.so ${D}${libdir}/libLLVM-${PV}.so
}
PACKAGES += "${PN}-bugpointpasses ${PN}-llvmhello"
@@ -134,14 +136,14 @@ FILES_${PN}-dbg = " \
${libdir}/${LLVM_DIR}/.debug/BugpointPasses.so \
${libdir}/${LLVM_DIR}/.debug/LLVMHello.so \
${libdir}/${LLVM_DIR}/.debug/libLTO.so* \
- ${libdir}/${LLVM_DIR}/.debug/llvm-config-host \
+ ${libdir}/${LLVM_DIR}/.debug/llvm-config \
/usr/src/debug \
"
FILES_${PN}-dev = " \
${bindir}/${LLVM_DIR} \
${includedir}/${LLVM_DIR} \
- ${libdir}/${LLVM_DIR}/llvm-config-host \
+ ${libdir}/${LLVM_DIR}/llvm-config \
"
RRECOMMENDS_${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index e14372775b..a26858df85 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -25,8 +25,8 @@ REQUIRED_DISTRO_FEATURES = "opengl"
PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)}"
-export LLVM_CONFIG = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config-host"
-
+export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}"
+export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config"
EXTRA_OECONF = "--enable-shared-glapi \
--disable-opencl \
--with-llvm-prefix=${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE} \
--
2.13.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/4] musl: Drop the protected symbol optimization at configure time
@ 2017-08-09 14:19 Khem Raj
0 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2017-08-09 14:19 UTC (permalink / raw)
To: openembedded-core
lld and gold can not handle it and treat it wrong
Fixes
[YOCTO #11689]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/musl/musl_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 53a8ba196a..93e3535c8d 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -36,6 +36,7 @@ CONFIGUREOPTS = " \
--libdir=${libdir} \
--includedir=${includedir} \
--syslibdir=${base_libdir} \
+ --disable-visibility \
"
do_configure() {
--
2.14.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-08-09 14:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-01 13:55 [PATCH 1/4] musl: Drop the protected symbol optimization at configure time Khem Raj
2017-08-01 13:55 ` [PATCH 2/4] mesa: Use chrpath to delete rpaths Khem Raj
2017-08-01 13:55 ` [PATCH 3/4] mesa: Depend on llvm-native Khem Raj
2017-08-01 13:55 ` [PATCH V2 4/4] mesa, llvm: Use native version of llvm-config Khem Raj
2017-08-09 14:19 [PATCH 1/4] musl: Drop the protected symbol optimization at configure time Khem Raj
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.