Skip to contentSkip to conversation

Update coreutils, libtool and fixes needed for gold

PATCH In review Khem Raj 4 participants 12 messages Oct 20, 2011 – Oct 26, 2011

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

cover Update coreutils, libtool and fixes needed for gold

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%)
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/4 xserver-xorg: Add mesa-dri to DEPENDS

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.
---
 .../xorg-xserver/xserver-xorg_1.11.1.bb            |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb +1 -0
index 0f94fe2..2aa71e5 100644
@@ -1,2 +1,3 @@
 require xserver-xorg.inc
 require xserver-xorg-${PV}.inc
+DEPENDS += "mesa-dri"
Signature · 1 line
1.7.5.4
author
#2 lore raw

PATCH 2/4 gcc-4.6: Backport fix for PR32219

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

---
 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
meta/recipes-devtools/gcc/gcc-4.6.inc +2 -1
index fbc90ea..469457c 100644
@@ -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 "
meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch new file +71 -0

71 lines not on this page · raw message

Signature · 1 line
1.7.5.4
author
#3 lore raw

PATCH 3/4 coreutils: Upgrade recipe 8.12 -> 8.14

In reply to Khem Raj

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

---
 .../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%)
meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch renamed from meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch +9 -9
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
@@ -8,24 +8,24 @@ Signed-off-by: Khem Raj <[email protected]>
 
 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
meta/recipes-core/coreutils/coreutils_8.14.bb renamed from meta/recipes-core/coreutils/coreutils_8.12.bb +6 -5
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
@@ -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} () {
meta/site/common-linux +3 -0
index 00ac717..947ed5b 100644
@@ -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}
Signature · 1 line
1.7.5.4
author
#4 lore raw

PATCH 4/4 libtool: Upgrade from 2.4 -> 2.4.2

In reply to Khem Raj

Adjust prefix.patch and delete resolve-sysroot.patch since its already applied upstream

---
 .../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%)
meta/recipes-devtools/libtool/libtool-2.4.2.inc renamed from meta/recipes-devtools/libtool/libtool.inc +20 -6
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
@@ -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"
meta/recipes-devtools/libtool/libtool-2.4.inc deleted +0 -13
deleted file mode 100644
index e3d17b7..0000000
@@ -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
meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-cross_2.4.bb +1 -1
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
@@ -1,6 +1,6 @@
 require libtool-${PV}.inc
 
-PR = "r4"
+PR = "${INC_PR}.0"
 PACKAGES = ""
 SRC_URI += "file://prefix.patch"
 
meta/recipes-devtools/libtool/libtool-native_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-native_2.4.bb +1 -1
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
@@ -2,7 +2,7 @@ require libtool-${PV}.inc
 
 DEPENDS = ""
 
-PR = "r4"
+PR = "${INC_PR}.0"
 SRC_URI += "file://prefix.patch"
 
 inherit native
meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb +1 -1
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
@@ -1,6 +1,6 @@
 require libtool-${PV}.inc
 
-PR = "r4"
+PR = "${INC_PR}.0"
 SRC_URI += "file://prefix.patch"
 
 inherit nativesdk
meta/recipes-devtools/libtool/libtool/prefix.patch +23 -23

90 lines not on this page · raw message

meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch deleted +0 -42

42 lines not on this page · raw message

meta/recipes-devtools/libtool/libtool_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool_2.4.bb +1 -1
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
@@ -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.
Signature · 1 line
1.7.5.4
#5 lore raw

Re: [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS

In reply to Khem Raj
Quoted 23 lines · Khem Raj

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.
---
 .../xorg-xserver/xserver-xorg_1.11.1.bb            |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb +0 -0
index 0f94fe2..2aa71e5 100644

meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb line 3

Quoted 3 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb +1 -0
@@ -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"

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#6 lore raw

Re: [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS

Op 20 okt. 2011, om 21:44 heeft Martin Jansa het volgende geschreven:

Quoted 19 lines · Khem Raj
Quoted 18 lines

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.

---
.../xorg-xserver/xserver-xorg_1.11.1.bb | 1 +

1 files changed, 1 insertions(+), 0 deletions(-)
Quoted 13 lines
Quoted 8 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb +0 -0
index 0f94fe2..2aa71e5 100644
@@ -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

#7 lore raw

Re: [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS

Quoted 36 lines · Koen Kooi

Op 20 okt. 2011, om 21:44 heeft Martin Jansa het volgende geschreven:

Quoted 19 lines · Khem Raj
Quoted 18 lines

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.

---
.../xorg-xserver/xserver-xorg_1.11.1.bb | 1 +

1 files changed, 1 insertions(+), 0 deletions(-)
Quoted 13 lines
Quoted 8 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb +0 -0
index 0f94fe2..2aa71e5 100644
@@ -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"

Quoted 1 line

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.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#8 lore raw

PATCH 1/1 default-providers: switch virtual/libgl from mesa-xlib to mesa-dri

* to match default virtual/xserver

---
 meta/conf/distro/include/default-providers.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/default-providers.inc +1 -1
index 66f7ff3..be23d36 100644
@@ -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"
Signature · 1 line
1.7.7
#9 lore raw

Re: [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS

In reply to Martin Jansa

Op 20 okt. 2011, om 23:48 heeft Martin Jansa het volgende geschreven:

Quoted 37 lines · Koen Kooi
Quoted 36 lines

Op 20 okt. 2011, om 21:44 heeft Martin Jansa het volgende geschreven:

Quoted 32 lines · Khem Raj
Quoted 23 lines

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.

---
.../xorg-xserver/xserver-xorg_1.11.1.bb | 1 +

1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb +0 -0
index 0f94fe2..2aa71e5 100644
@@ -1,2 +1,3 @@
Quoted 3 lines

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"

Quoted 3 lines
Quoted 1 line

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.

author
#10 lore raw

Re: [PATCH 1/4] xserver-xorg: Add mesa-dri to DEPENDS

In reply to Martin Jansa
Quoted 19 lines · Martin Jansa
Quoted 18 lines · Khem Raj

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.

---
 .../xorg-xserver/xserver-xorg_1.11.1.bb            |    1 +

 1 files changed, 1 insertions(+), 0 deletions(-)
Quoted 13 lines
Quoted 8 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb +0 -0
index 0f94fe2..2aa71e5 100644
@@ -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.

#11 lore raw
In reply to Khem Raj
Quoted 12 lines · Khem Raj

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)
Quoted 8 lines

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

Quoted 2 lines
   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!

Quoted 26 lines
  .../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%)