* [PATCH 0/4] Update coreutils, libtool and fixes needed for gold
@ 2011-10-20 19:35 Khem Raj
2011-10-20 19:36 ` [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS Khem Raj
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Khem Raj @ 2011-10-20 19:35 UTC (permalink / raw)
To: openembedded-core
This patchset does the following
1. Upgrades coreutils and libtool partially helped with gold
2. Fixes a gcc bug thats highlighted by gold when linking connman
3. Fixes a DEPENDS problem in xserver-xorg
With these changes I am able to build systemd-gnome-image for angstrom on arm
The following changes since commit 808b43dff8facfddae05ef14b7b7daf5fa993a3d:
libtool: Upgrade from 2.4 -> 2.4.2 (2011-10-20 12:26:13 -0700)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib kraj/gold-updates
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/gold-updates
Khem Raj (4):
xserver-xorg: Add mesa-dri to DEPENDS
gcc-4.6: Backport fix for PR32219
coreutils: Upgrade recipe 8.12 -> 8.14
libtool: Upgrade from 2.4 -> 2.4.2
.../remove-usr-local-lib-from-m4.patch | 18 +++---
.../{coreutils_8.12.bb => coreutils_8.14.bb} | 11 ++--
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch | 71 ++++++++++++++++++++
.../libtool/{libtool.inc => libtool-2.4.2.inc} | 26 ++++++--
meta/recipes-devtools/libtool/libtool-2.4.inc | 13 ----
...libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} | 2 +-
...btool-native_2.4.bb => libtool-native_2.4.2.bb} | 2 +-
...nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} | 2 +-
meta/recipes-devtools/libtool/libtool/prefix.patch | 46 ++++++------
.../libtool/libtool/resolve-sysroot.patch | 42 ------------
.../libtool/{libtool_2.4.bb => libtool_2.4.2.bb} | 2 +-
.../xorg-xserver/xserver-xorg_1.11.1.bb | 1 +
meta/site/common-linux | 3 +
14 files changed, 139 insertions(+), 103 deletions(-)
rename meta/recipes-core/coreutils/{coreutils-8.12 => coreutils-8.14}/remove-usr-local-lib-from-m4.patch (65%)
rename meta/recipes-core/coreutils/{coreutils_8.12.bb => coreutils_8.14.bb} (90%)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (57%)
delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.inc
rename meta/recipes-devtools/libtool/{libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} (98%)
rename meta/recipes-devtools/libtool/{libtool-native_2.4.bb => libtool-native_2.4.2.bb} (96%)
rename meta/recipes-devtools/libtool/{libtool-nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} (97%)
delete mode 100644 meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
rename meta/recipes-devtools/libtool/{libtool_2.4.bb => libtool_2.4.2.bb} (94%)
--
1.7.5.4
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS
2011-10-20 19:35 [PATCH 0/4] Update coreutils, libtool and fixes needed for gold Khem Raj
@ 2011-10-20 19:36 ` Khem Raj
2011-10-20 19:44 ` Martin Jansa
2011-10-20 19:36 ` [PATCH 2/4] gcc-4.6: Backport fix for PR32219 Khem Raj
` (3 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Khem Raj @ 2011-10-20 19:36 UTC (permalink / raw)
To: openembedded-core
Fixes the compile problems e.g.
| checking for GL... yes
| checking for DRIPROTO... yes
| checking for DRI... no
| configure: error: Package requirements (glproto >= 1.4.14 dri >=
7.8.0) were not met:
|
| No package 'dri' found
|
| Consider adjusting the PKG_CONFIG_PATH environment variable if you
| installed software in a non-standard prefix.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../xorg-xserver/xserver-xorg_1.11.1.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
index 0f94fe2..2aa71e5 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
@@ -1,2 +1,3 @@
require xserver-xorg.inc
require xserver-xorg-${PV}.inc
+DEPENDS += "mesa-dri"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/4] gcc-4.6: Backport fix for PR32219
2011-10-20 19:35 [PATCH 0/4] Update coreutils, libtool and fixes needed for gold Khem Raj
2011-10-20 19:36 ` [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS Khem Raj
@ 2011-10-20 19:36 ` Khem Raj
2011-10-20 19:36 ` [PATCH 3/4] coreutils: Upgrade recipe 8.12 -> 8.14 Khem Raj
` (2 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Khem Raj @ 2011-10-20 19:36 UTC (permalink / raw)
To: openembedded-core
This fix is needed for gold to work. Otherwise
connman fails to build since it used hidden weak
symbols.
See
http://gcc.gnu.org/bugzilla/PR32219
http://www.cygwin.com/ml/binutils/2008-02/msg00239.html
The fix proposed to gcc had reviews which were not addressed hence the
patch is not yet
applied to gcc upstream.
connman can also have workaround by changing the visibility of these
symbols to be default
__attribute__ ((weak, visibility("hidden")))
to
__attribute__ ((weak, visibility("default")))
in include/plugin.h
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch | 71 +++++++++++++++++++++++
2 files changed, 73 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index fbc90ea..469457c 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r15"
+PR = "r16"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
@@ -70,6 +70,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://fix-for-ice-50099.patch \
file://gcc-with-linker-hash-style.patch \
file://pr46934.patch \
+ file://pr32219.patch \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch b/meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
new file mode 100644
index 0000000..e310080
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
@@ -0,0 +1,71 @@
+Hi,
+
+As suggested by richi.
+regtested on i686-linux-gnu with all default languages and no regressions.
+Ok for trunk?
+
+gcc/ChangeLog
+2010-03-15 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
+
+ PR target/32219
+ * varasm.c (default_binds_local_p_1): Weak data is not local.
+
+gcc/testsuite/ChangeLog
+2010-03-15 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
+
+ PR target/32219
+ * gcc.dg/visibility-21.c: New test.
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ gcc/testsuite/gcc.dg/visibility-21.c | 14 ++++++++++++++
+ gcc/varasm.c | 8 ++++----
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.dg/visibility-21.c
+
+Index: gcc-4_6-branch/gcc/testsuite/gcc.dg/visibility-21.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4_6-branch/gcc/testsuite/gcc.dg/visibility-21.c 2011-10-18 17:11:33.224827436 -0700
+@@ -0,0 +1,14 @@
++/* PR target/32219 */
++/* { dg-do run } */
++/* { dg-require-visibility "" } */
++/* { dg-options "-fPIC" { target fpic } } */
++
++extern void f() __attribute__((weak,visibility("hidden")));
++extern int puts( char const* );
++int main()
++{
++ if (f)
++ f();
++ return 0;
++}
++
+Index: gcc-4_6-branch/gcc/varasm.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/varasm.c 2011-09-16 19:58:21.000000000 -0700
++++ gcc-4_6-branch/gcc/varasm.c 2011-10-18 17:19:06.431074788 -0700
+@@ -6760,6 +6760,10 @@
+ /* Static variables are always local. */
+ else if (! TREE_PUBLIC (exp))
+ local_p = true;
++ /* hidden weak can't be overridden by something non-local, all
++ that is possible is that it is not defined at all. */
++ else if (DECL_WEAK (exp))
++ local_p = false;
+ /* A variable is local if the user has said explicitly that it will
+ be. */
+ else if ((DECL_VISIBILITY_SPECIFIED (exp)
+@@ -6773,11 +6777,6 @@
+ local. */
+ else if (DECL_VISIBILITY (exp) != VISIBILITY_DEFAULT)
+ local_p = true;
+- /* Default visibility weak data can be overridden by a strong symbol
+- in another module and so are not local. */
+- else if (DECL_WEAK (exp)
+- && !resolved_locally)
+- local_p = false;
+ /* If PIC, then assume that any global name can be overridden by
+ symbols resolved from other modules. */
+ else if (shlib)
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/4] coreutils: Upgrade recipe 8.12 -> 8.14
2011-10-20 19:35 [PATCH 0/4] Update coreutils, libtool and fixes needed for gold Khem Raj
2011-10-20 19:36 ` [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS Khem Raj
2011-10-20 19:36 ` [PATCH 2/4] gcc-4.6: Backport fix for PR32219 Khem Raj
@ 2011-10-20 19:36 ` Khem Raj
2011-10-20 19:36 ` [PATCH 4/4] libtool: Upgrade from 2.4 -> 2.4.2 Khem Raj
2011-10-26 20:04 ` [PATCH 0/4] Update coreutils, libtool and fixes needed for gold Saul Wold
4 siblings, 0 replies; 12+ messages in thread
From: Khem Raj @ 2011-10-20 19:36 UTC (permalink / raw)
To: openembedded-core
Change in site files is needed since in cross
build envrionment the test to check for
gl_cv_func_fstatat_zero_flag is a runtime test
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../remove-usr-local-lib-from-m4.patch | 18 +++++++++---------
.../{coreutils_8.12.bb => coreutils_8.14.bb} | 11 ++++++-----
meta/site/common-linux | 3 +++
3 files changed, 18 insertions(+), 14 deletions(-)
rename meta/recipes-core/coreutils/{coreutils-8.12 => coreutils-8.14}/remove-usr-local-lib-from-m4.patch (65%)
rename meta/recipes-core/coreutils/{coreutils_8.12.bb => coreutils_8.14.bb} (90%)
diff --git a/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch
similarity index 65%
rename from meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch
rename to meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch
index aac097a..2ef8a54 100644
--- a/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch
+++ b/meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch
@@ -8,24 +8,24 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Inappropriate [Upstream does care for AIX while we may not]
-Index: coreutils-8.12/m4/getloadavg.m4
+Index: coreutils-8.14/m4/getloadavg.m4
===================================================================
---- coreutils-8.12.orig/m4/getloadavg.m4 2011-08-03 14:03:59.982197767 -0700
-+++ coreutils-8.12/m4/getloadavg.m4 2011-08-03 14:04:20.402197763 -0700
-@@ -44,16 +44,6 @@ AC_CHECK_FUNC([getloadavg], [],
- [LIBS="-lutil $LIBS" gl_have_func=yes])
+--- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19 08:09:24.000000000 -0700
++++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357 -0700
+@@ -41,16 +41,6 @@
+ [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes])
fi
-- if test $gl_have_func = no; then
+- if test $gl_func_getloadavg_done = no; then
- # There is a commonly available library for RS/6000 AIX.
- # Since it is not a standard part of AIX, it might be installed locally.
- gl_getloadavg_LIBS=$LIBS
- LIBS="-L/usr/local/lib $LIBS"
- AC_CHECK_LIB([getloadavg], [getloadavg],
-- [LIBS="-lgetloadavg $LIBS" gl_have_func=yes],
+- [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes],
- [LIBS=$gl_getloadavg_LIBS])
- fi
-
# Set up the replacement function if necessary.
- if test $gl_have_func = no; then
- AC_LIBOBJ([getloadavg])
+ if test $gl_func_getloadavg_done = no; then
+ HAVE_GETLOADAVG=0
diff --git a/meta/recipes-core/coreutils/coreutils_8.12.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb
similarity index 90%
rename from meta/recipes-core/coreutils/coreutils_8.12.bb
rename to meta/recipes-core/coreutils/coreutils_8.14.bb
index 0004ce7..f3b7af7 100644
--- a/meta/recipes-core/coreutils/coreutils_8.12.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.14.bb
@@ -7,18 +7,17 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad"
-PR = "r3"
+PR = "r0"
DEPENDS = "gmp"
DEPENDS_virtclass-native = ""
inherit autotools gettext
-SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.gz \
+SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
file://remove-usr-local-lib-from-m4.patch \
"
-
-SRC_URI[md5sum] = "fce7999953a67243d00d75cc86dbcaa6"
-SRC_URI[sha256sum] = "9e233a62c98a3378a7b0483d2ae3d662dbaf6cd3917d3830d3514665e12a85c8"
+SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a"
+SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d"
EXTRA_OECONF_virtclass-native = "--without-gmp"
@@ -49,6 +48,8 @@ do_install_append() {
# in update-alternatives to fail, therefore use lbracket - the name used
# for the actual source file.
mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN}
+ install -d ${D}${libdir}/coreutils
+ mv ${D}${libexecdir}/coreutils/libstdbuf.so ${D}${libdir}/coreutils
}
pkg_postinst_${PN} () {
diff --git a/meta/site/common-linux b/meta/site/common-linux
index 00ac717..947ed5b 100644
--- a/meta/site/common-linux
+++ b/meta/site/common-linux
@@ -34,6 +34,9 @@ bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
+# coreutils
+gl_cv_func_fstatat_zero_flag=${gl_cv_func_fstatat_zero_flag=yes}
+
# mysql
ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes}
ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/4] libtool: Upgrade from 2.4 -> 2.4.2
2011-10-20 19:35 [PATCH 0/4] Update coreutils, libtool and fixes needed for gold Khem Raj
` (2 preceding siblings ...)
2011-10-20 19:36 ` [PATCH 3/4] coreutils: Upgrade recipe 8.12 -> 8.14 Khem Raj
@ 2011-10-20 19:36 ` Khem Raj
2011-10-26 20:04 ` [PATCH 0/4] Update coreutils, libtool and fixes needed for gold Saul Wold
4 siblings, 0 replies; 12+ messages in thread
From: Khem Raj @ 2011-10-20 19:36 UTC (permalink / raw)
To: openembedded-core
Adjust prefix.patch and delete resolve-sysroot.patch
since its already applied upstream
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../libtool/{libtool.inc => libtool-2.4.2.inc} | 26 +++++++++---
meta/recipes-devtools/libtool/libtool-2.4.inc | 13 ------
...libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} | 2 +-
...btool-native_2.4.bb => libtool-native_2.4.2.bb} | 2 +-
...nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} | 2 +-
meta/recipes-devtools/libtool/libtool/prefix.patch | 46 ++++++++++----------
.../libtool/libtool/resolve-sysroot.patch | 42 ------------------
.../libtool/{libtool_2.4.bb => libtool_2.4.2.bb} | 2 +-
8 files changed, 47 insertions(+), 88 deletions(-)
rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (57%)
delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.inc
rename meta/recipes-devtools/libtool/{libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} (98%)
rename meta/recipes-devtools/libtool/{libtool-native_2.4.bb => libtool-native_2.4.2.bb} (96%)
rename meta/recipes-devtools/libtool/{libtool-nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} (97%)
delete mode 100644 meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
rename meta/recipes-devtools/libtool/{libtool_2.4.bb => libtool_2.4.2.bb} (94%)
diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
similarity index 57%
rename from meta/recipes-devtools/libtool/libtool.inc
rename to meta/recipes-devtools/libtool/libtool-2.4.2.inc
index ef9095b..1f652ef 100644
--- a/meta/recipes-devtools/libtool/libtool.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -1,4 +1,3 @@
-SUMMARY = "Generic library support script"
DESCRIPTION = "This is GNU libtool, a generic library support script. \
Libtool hides the complexity of generating special library types \
(such as shared libraries) behind a consistent interface."
@@ -8,21 +7,36 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
+INC_PR = "r0"
+
SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://trailingslash.patch \
file://prefix-manpage-fix.patch \
file://rename-with-sysroot.patch \
- file://resolve-sysroot.patch \
file://use-sysroot-in-libpath.patch \
file://fix-final-rpath.patch \
file://avoid_absolute_paths_for_general_utils.patch \
- file://fix-rpath.patch "
+ file://fix-rpath.patch \
+ "
+
+SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"
+SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918"
do_compile_prepend () {
- # Sometimes this file doesn't get rebuilt, force the issue
- rm -f ${S}/libltdl/config/ltmain.sh
- make libltdl/config/ltmain.sh
+ # Sometimes this file doesn't get rebuilt, force the issue
+ rm -f ${S}/libltdl/config/ltmain.sh
+ make libltdl/config/ltmain.sh
}
inherit autotools
EXTRA_AUTORECONF = "--exclude=libtoolize"
+
+DEPENDS = "libtool-native"
+
+PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
+FILES_${PN} += "${datadir}/aclocal*"
+FILES_libltdl = "${libdir}/libltdl.so.*"
+FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
+FILES_libltdl-dbg = "${libdir}/.debug/"
+
+EXTRA_OECONF = "--with-sysroot"
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.inc b/meta/recipes-devtools/libtool/libtool-2.4.inc
deleted file mode 100644
index e3d17b7..0000000
--- a/meta/recipes-devtools/libtool/libtool-2.4.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-require libtool.inc
-DEPENDS = "libtool-native"
-
-PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
-FILES_${PN} += "${datadir}/aclocal*"
-FILES_libltdl = "${libdir}/libltdl.so.*"
-FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
-FILES_libltdl-dbg = "${libdir}/.debug/"
-
-SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
-SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e"
-
-EXTRA_OECONF = "--with-sysroot"
\ No newline at end of file
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
similarity index 98%
rename from meta/recipes-devtools/libtool/libtool-cross_2.4.bb
rename to meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
index 6d512b1..b7fe851 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-PR = "r4"
+PR = "${INC_PR}.0"
PACKAGES = ""
SRC_URI += "file://prefix.patch"
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
similarity index 96%
rename from meta/recipes-devtools/libtool/libtool-native_2.4.bb
rename to meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
index 3d0998e..f12e6a1 100644
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
@@ -2,7 +2,7 @@ require libtool-${PV}.inc
DEPENDS = ""
-PR = "r4"
+PR = "${INC_PR}.0"
SRC_URI += "file://prefix.patch"
inherit native
diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb
similarity index 97%
rename from meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
rename to meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb
index a96d1d1..bd45dfe 100644
--- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-PR = "r4"
+PR = "${INC_PR}.0"
SRC_URI += "file://prefix.patch"
inherit nativesdk
diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch
index 1b20324..fabec7a 100644
--- a/meta/recipes-devtools/libtool/libtool/prefix.patch
+++ b/meta/recipes-devtools/libtool/libtool/prefix.patch
@@ -9,11 +9,11 @@ Updated: Date: 2010/06/28
Nitin A Kamble <nitin.a.kamble@intel.com>
-Index: libtool-2.4/libltdl/m4/libtool.m4
+Index: libtool-2.4.2/libltdl/m4/libtool.m4
===================================================================
---- libtool-2.4.orig/libltdl/m4/libtool.m4
-+++ libtool-2.4/libltdl/m4/libtool.m4
-@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
+--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 2011-10-19 21:22:53.000000000 -0700
++++ libtool-2.4.2/libltdl/m4/libtool.m4 2011-10-19 21:23:30.716036612 -0700
+@@ -94,7 +94,8 @@
LIBTOOL_DEPS="$ltmain"
# Always use our own libtool.
@@ -23,7 +23,7 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
AC_SUBST(LIBTOOL)dnl
_LT_SETUP
-@@ -204,7 +205,7 @@ aix3*)
+@@ -206,7 +207,7 @@
esac
# Global variables:
@@ -32,11 +32,11 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
can_build_shared=yes
# All known linkers require a `.a' archive for static linking (except MSVC,
-Index: libtool-2.4/Makefile.am
+Index: libtool-2.4.2/Makefile.am
===================================================================
---- libtool-2.4.orig/Makefile.am
-+++ libtool-2.4/Makefile.am
-@@ -31,7 +31,7 @@ AM_LDFLAGS =
+--- libtool-2.4.2.orig/Makefile.am 2011-10-19 21:22:53.000000000 -0700
++++ libtool-2.4.2/Makefile.am 2011-10-19 21:25:33.152638032 -0700
+@@ -31,7 +31,7 @@
DIST_SUBDIRS = .
EXTRA_DIST =
@@ -45,8 +45,17 @@ Index: libtool-2.4/Makefile.am
CLEANFILES =
MOSTLYCLEANFILES =
-@@ -65,7 +65,7 @@ rebuild = rebuild=:; $(timestamp); corre
- ## ---------------- ##
+@@ -72,7 +72,7 @@
+ ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
+ ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
+ ChangeLog.2008 ChangeLog.2009 ChangeLog.2010
+-CLEANFILES += libtool libtoolize libtoolize.tmp \
++CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
+ $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
+
+ ## These are the replacements that need to be made at bootstrap time,
+@@ -231,7 +231,7 @@
+ -e 's,@SED\@,$(SED),g'
# The libtool distributor and the standalone libtool script.
-bin_SCRIPTS = libtoolize libtool
@@ -54,7 +63,7 @@ Index: libtool-2.4/Makefile.am
libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
rm -f libtoolize.tmp libtoolize
-@@ -90,8 +90,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib
+@@ -244,8 +244,8 @@
# We used to do this with a 'stamp-vcl' file, but non-gmake builds
# would rerun configure on every invocation, so now we manually
# check the version numbers from the build rule when necessary.
@@ -65,7 +74,7 @@ Index: libtool-2.4/Makefile.am
if test -f "$$target"; then \
set dummy `./$$target --version | sed 1q`; actualver="$$5"; \
test "$$actualver" = "$$correctver" && rebuild=false; \
-@@ -100,8 +100,8 @@ libtool: $(top_builddir)/config.status $
+@@ -254,8 +254,8 @@
case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
done; \
if $$rebuild; then \
@@ -76,16 +85,7 @@ Index: libtool-2.4/Makefile.am
fi
.PHONY: configure-subdirs
-@@ -146,7 +146,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li
- ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
- ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
- ChangeLog.2008 ChangeLog.2009
--CLEANFILES += libtool libtoolize libtoolize.tmp \
-+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
- $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
-
- ## We build ltversion.m4 here, instead of from config.status,
-@@ -526,12 +526,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
+@@ -535,12 +535,12 @@
BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
diff --git a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch b/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
deleted file mode 100644
index 0341987..0000000
--- a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Pending
-
-Sometimes .las have =/a/b/c.la in dependency_libs. This should be
-resolved to sysroot.
-
--Khem Raj <raj.khem@gmail.com>
-
-Index: libtool-2.4/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.4.orig/libltdl/config/ltmain.m4sh
-+++ libtool-2.4/libltdl/config/ltmain.m4sh
-@@ -8479,7 +8479,8 @@ EOF
- *.la)
- func_basename "$deplib"
- name="$func_basename_result"
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+ func_resolve_sysroot "$deplib"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
- test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
- func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-@@ -8505,7 +8506,9 @@ EOF
- *.la)
- func_basename "$lib"
- name="$func_basename_result"
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+ func_resolve_sysroot "$lib"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-+
- test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-@@ -8524,7 +8527,8 @@ EOF
- # the library:
- func_basename "$lib"
- name="$func_basename_result"
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+ func_resolve_sysroot "$lib"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
- test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.bb b/meta/recipes-devtools/libtool/libtool_2.4.2.bb
similarity index 94%
rename from meta/recipes-devtools/libtool/libtool_2.4.bb
rename to meta/recipes-devtools/libtool/libtool_2.4.2.bb
index 3002215..a2eb4ea 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool_2.4.2.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-PR = "r4"
+PR = "${INC_PR}.0"
#
# We want the results of libtool-cross preserved - don't stage anything ourselves.
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS
2011-10-20 19:36 ` [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS Khem Raj
@ 2011-10-20 19:44 ` Martin Jansa
2011-10-20 21:42 ` Koen Kooi
2011-10-20 22:39 ` Khem Raj
0 siblings, 2 replies; 12+ messages in thread
From: Martin Jansa @ 2011-10-20 19:44 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1203 bytes --]
On Thu, Oct 20, 2011 at 12:36:01PM -0700, Khem Raj wrote:
> Fixes the compile problems e.g.
>
> | checking for GL... yes
> | checking for DRIPROTO... yes
> | checking for DRI... no
> | configure: error: Package requirements (glproto >= 1.4.14 dri >=
> 7.8.0) were not met:
> |
> | No package 'dri' found
> |
> | Consider adjusting the PKG_CONFIG_PATH environment variable if you
> | installed software in a non-standard prefix.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../xorg-xserver/xserver-xorg_1.11.1.bb | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
> index 0f94fe2..2aa71e5 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
> @@ -1,2 +1,3 @@
> require xserver-xorg.inc
> require xserver-xorg-${PV}.inc
> +DEPENDS += "mesa-dri"
You can do this in xserver-xorg.inc
just change
LIB_DEPS += "virtual/libgl" to
LIB_DEPS += "mesa-dri"
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS
2011-10-20 19:44 ` Martin Jansa
@ 2011-10-20 21:42 ` Koen Kooi
2011-10-20 21:48 ` Martin Jansa
2011-10-20 22:39 ` Khem Raj
1 sibling, 1 reply; 12+ messages in thread
From: Koen Kooi @ 2011-10-20 21:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 20 okt. 2011, om 21:44 heeft Martin Jansa het volgende geschreven:
> On Thu, Oct 20, 2011 at 12:36:01PM -0700, Khem Raj wrote:
>> Fixes the compile problems e.g.
>>
>> | checking for GL... yes
>> | checking for DRIPROTO... yes
>> | checking for DRI... no
>> | configure: error: Package requirements (glproto >= 1.4.14 dri >=
>> 7.8.0) were not met:
>> |
>> | No package 'dri' found
>> |
>> | Consider adjusting the PKG_CONFIG_PATH environment variable if you
>> | installed software in a non-standard prefix.
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> .../xorg-xserver/xserver-xorg_1.11.1.bb | 1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
>> index 0f94fe2..2aa71e5 100644
>> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
>> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
>> @@ -1,2 +1,3 @@
>> require xserver-xorg.inc
>> require xserver-xorg-${PV}.inc
>> +DEPENDS += "mesa-dri"
>
> You can do this in xserver-xorg.inc
> just change
> LIB_DEPS += "virtual/libgl" to
> LIB_DEPS += "mesa-dri"
that will drag it in for -lite as well, is that OK?
regards,
Koen
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS
2011-10-20 21:42 ` Koen Kooi
@ 2011-10-20 21:48 ` Martin Jansa
2011-10-20 21:49 ` [PATCH] default-providers: switch virtual/libgl from mesa-xlib to mesa-dri Martin Jansa
2011-10-21 5:58 ` [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS Koen Kooi
0 siblings, 2 replies; 12+ messages in thread
From: Martin Jansa @ 2011-10-20 21:48 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1637 bytes --]
On Thu, Oct 20, 2011 at 11:42:27PM +0200, Koen Kooi wrote:
>
> Op 20 okt. 2011, om 21:44 heeft Martin Jansa het volgende geschreven:
>
> > On Thu, Oct 20, 2011 at 12:36:01PM -0700, Khem Raj wrote:
> >> Fixes the compile problems e.g.
> >>
> >> | checking for GL... yes
> >> | checking for DRIPROTO... yes
> >> | checking for DRI... no
> >> | configure: error: Package requirements (glproto >= 1.4.14 dri >=
> >> 7.8.0) were not met:
> >> |
> >> | No package 'dri' found
> >> |
> >> | Consider adjusting the PKG_CONFIG_PATH environment variable if you
> >> | installed software in a non-standard prefix.
> >>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> ---
> >> .../xorg-xserver/xserver-xorg_1.11.1.bb | 1 +
> >> 1 files changed, 1 insertions(+), 0 deletions(-)
> >>
> >> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
> >> index 0f94fe2..2aa71e5 100644
> >> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
> >> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
> >> @@ -1,2 +1,3 @@
> >> require xserver-xorg.inc
> >> require xserver-xorg-${PV}.inc
> >> +DEPENDS += "mesa-dri"
> >
> > You can do this in xserver-xorg.inc
> > just change
> > LIB_DEPS += "virtual/libgl" to
> > LIB_DEPS += "mesa-dri"
>
> that will drag it in for -lite as well, is that OK?
No it will not, this is not xserver-xorg-common.inc
I'll send patch for default-providers.inc to switch default to mesa-dri
too.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
2011-10-20 21:48 ` Martin Jansa
@ 2011-10-20 21:49 ` Martin Jansa
2011-10-21 5:58 ` [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS Koen Kooi
1 sibling, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2011-10-20 21:49 UTC (permalink / raw)
To: openembedded-core
* to match default virtual/xserver
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/distro/include/default-providers.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 66f7ff3..be23d36 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
--
1.7.7
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS
2011-10-20 19:44 ` Martin Jansa
2011-10-20 21:42 ` Koen Kooi
@ 2011-10-20 22:39 ` Khem Raj
1 sibling, 0 replies; 12+ messages in thread
From: Khem Raj @ 2011-10-20 22:39 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, Oct 20, 2011 at 12:44 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Oct 20, 2011 at 12:36:01PM -0700, Khem Raj wrote:
>> Fixes the compile problems e.g.
>>
>> | checking for GL... yes
>> | checking for DRIPROTO... yes
>> | checking for DRI... no
>> | configure: error: Package requirements (glproto >= 1.4.14 dri >=
>> 7.8.0) were not met:
>> |
>> | No package 'dri' found
>> |
>> | Consider adjusting the PKG_CONFIG_PATH environment variable if you
>> | installed software in a non-standard prefix.
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> .../xorg-xserver/xserver-xorg_1.11.1.bb | 1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
>> index 0f94fe2..2aa71e5 100644
>> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
>> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
>> @@ -1,2 +1,3 @@
>> require xserver-xorg.inc
>> require xserver-xorg-${PV}.inc
>> +DEPENDS += "mesa-dri"
>
> You can do this in xserver-xorg.inc
> just change
> LIB_DEPS += "virtual/libgl" to
> LIB_DEPS += "mesa-dri"
thanks. I have updates the patch accordingly in the pull request.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS
2011-10-20 21:48 ` Martin Jansa
2011-10-20 21:49 ` [PATCH] default-providers: switch virtual/libgl from mesa-xlib to mesa-dri Martin Jansa
@ 2011-10-21 5:58 ` Koen Kooi
1 sibling, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2011-10-21 5:58 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 20 okt. 2011, om 23:48 heeft Martin Jansa het volgende geschreven:
> On Thu, Oct 20, 2011 at 11:42:27PM +0200, Koen Kooi wrote:
>>
>> Op 20 okt. 2011, om 21:44 heeft Martin Jansa het volgende geschreven:
>>
>>> On Thu, Oct 20, 2011 at 12:36:01PM -0700, Khem Raj wrote:
>>>> Fixes the compile problems e.g.
>>>>
>>>> | checking for GL... yes
>>>> | checking for DRIPROTO... yes
>>>> | checking for DRI... no
>>>> | configure: error: Package requirements (glproto >= 1.4.14 dri >=
>>>> 7.8.0) were not met:
>>>> |
>>>> | No package 'dri' found
>>>> |
>>>> | Consider adjusting the PKG_CONFIG_PATH environment variable if you
>>>> | installed software in a non-standard prefix.
>>>>
>>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>>> ---
>>>> .../xorg-xserver/xserver-xorg_1.11.1.bb | 1 +
>>>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
>>>> index 0f94fe2..2aa71e5 100644
>>>> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
>>>> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
>>>> @@ -1,2 +1,3 @@
>>>> require xserver-xorg.inc
>>>> require xserver-xorg-${PV}.inc
>>>> +DEPENDS += "mesa-dri"
>>>
>>> You can do this in xserver-xorg.inc
>>> just change
>>> LIB_DEPS += "virtual/libgl" to
>>> LIB_DEPS += "mesa-dri"
>>
>> that will drag it in for -lite as well, is that OK?
>
> No it will not, this is not xserver-xorg-common.inc
Ah, I got confused by 'require xserver-xorg-${PV}.inc'. Time to get some more coffee.
regards,
Koen.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/4] Update coreutils, libtool and fixes needed for gold
2011-10-20 19:35 [PATCH 0/4] Update coreutils, libtool and fixes needed for gold Khem Raj
` (3 preceding siblings ...)
2011-10-20 19:36 ` [PATCH 4/4] libtool: Upgrade from 2.4 -> 2.4.2 Khem Raj
@ 2011-10-26 20:04 ` Saul Wold
4 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2011-10-26 20:04 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 10/20/2011 09:35 PM, Khem Raj wrote:
> This patchset does the following
>
> 1. Upgrades coreutils and libtool partially helped with gold
> 2. Fixes a gcc bug thats highlighted by gold when linking connman
> 3. Fixes a DEPENDS problem in xserver-xorg
>
> With these changes I am able to build systemd-gnome-image for angstrom on arm
>
> The following changes since commit 808b43dff8facfddae05ef14b7b7daf5fa993a3d:
>
> libtool: Upgrade from 2.4 -> 2.4.2 (2011-10-20 12:26:13 -0700)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib kraj/gold-updates
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/gold-updates
>
> Khem Raj (4):
> xserver-xorg: Add mesa-dri to DEPENDS
> gcc-4.6: Backport fix for PR32219
> coreutils: Upgrade recipe 8.12 -> 8.14
These first 3 were pulled into OE-Core
> libtool: Upgrade from 2.4 -> 2.4.2
>
There was some discussion on the list about this one, I need to confirm
where we are with it.
Sau!
> .../remove-usr-local-lib-from-m4.patch | 18 +++---
> .../{coreutils_8.12.bb => coreutils_8.14.bb} | 11 ++--
> meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
> meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch | 71 ++++++++++++++++++++
> .../libtool/{libtool.inc => libtool-2.4.2.inc} | 26 ++++++--
> meta/recipes-devtools/libtool/libtool-2.4.inc | 13 ----
> ...libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} | 2 +-
> ...btool-native_2.4.bb => libtool-native_2.4.2.bb} | 2 +-
> ...nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} | 2 +-
> meta/recipes-devtools/libtool/libtool/prefix.patch | 46 ++++++------
> .../libtool/libtool/resolve-sysroot.patch | 42 ------------
> .../libtool/{libtool_2.4.bb => libtool_2.4.2.bb} | 2 +-
> .../xorg-xserver/xserver-xorg_1.11.1.bb | 1 +
> meta/site/common-linux | 3 +
> 14 files changed, 139 insertions(+), 103 deletions(-)
> rename meta/recipes-core/coreutils/{coreutils-8.12 => coreutils-8.14}/remove-usr-local-lib-from-m4.patch (65%)
> rename meta/recipes-core/coreutils/{coreutils_8.12.bb => coreutils_8.14.bb} (90%)
> create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
> rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (57%)
> delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.inc
> rename meta/recipes-devtools/libtool/{libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} (98%)
> rename meta/recipes-devtools/libtool/{libtool-native_2.4.bb => libtool-native_2.4.2.bb} (96%)
> rename meta/recipes-devtools/libtool/{libtool-nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} (97%)
> delete mode 100644 meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
> rename meta/recipes-devtools/libtool/{libtool_2.4.bb => libtool_2.4.2.bb} (94%)
>
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-10-26 20:10 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-20 19:35 [PATCH 0/4] Update coreutils, libtool and fixes needed for gold Khem Raj
2011-10-20 19:36 ` [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS Khem Raj
2011-10-20 19:44 ` Martin Jansa
2011-10-20 21:42 ` Koen Kooi
2011-10-20 21:48 ` Martin Jansa
2011-10-20 21:49 ` [PATCH] default-providers: switch virtual/libgl from mesa-xlib to mesa-dri Martin Jansa
2011-10-21 5:58 ` [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS Koen Kooi
2011-10-20 22:39 ` Khem Raj
2011-10-20 19:36 ` [PATCH 2/4] gcc-4.6: Backport fix for PR32219 Khem Raj
2011-10-20 19:36 ` [PATCH 3/4] coreutils: Upgrade recipe 8.12 -> 8.14 Khem Raj
2011-10-20 19:36 ` [PATCH 4/4] libtool: Upgrade from 2.4 -> 2.4.2 Khem Raj
2011-10-26 20:04 ` [PATCH 0/4] Update coreutils, libtool and fixes needed for gold Saul Wold
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.