diff options
| author | Steffen Sledz <sledz@dresearch.de> | 2010-03-11 12:39:14 +0100 |
|---|---|---|
| committer | Steffen Sledz <sledz@dresearch.de> | 2010-03-11 12:39:14 +0100 |
| commit | b35a5e4e5768d62fe7d8cdf97410e4925c9c81b2 (patch) | |
| tree | f245d6188c83de85e14610a98ddac96a25f1b757 | |
| parent | 20f3db21f3b7cc50d2c661e98596d366428c348b (diff) | |
| parent | 4891edc5e04a3c2bba3b121b323378d4ff062b2a (diff) | |
Merge remote branch 'upstream/org.openembedded.dev' into org.openembedded.dev
| -rw-r--r-- | classes/base.bbclass | 1 | ||||
| -rw-r--r-- | recipes/gtk+/gtk+.inc | 17 | ||||
| -rw-r--r-- | recipes/linux-libc-headers/linux-libc-headers.inc | 3 | ||||
| -rw-r--r-- | recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb | 2 | ||||
| -rw-r--r-- | recipes/readline/readline-5.2/fix-includes.patch | 13 |
5 files changed, 32 insertions, 4 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index bbc1cc78dc..a94fa2723b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1100,6 +1100,7 @@ sysroot_stage_dirs() { sysroot_stage_libdir $from${base_libdir} $to${STAGING_DIR_HOST}${base_libdir} fi sysroot_stage_dir $from${datadir} $to${STAGING_DATADIR} + sysroot_stage_dir $from${sysconfdir} $to${sysconfdir} } sysroot_stage_all() { diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc index 268657be0e..0444ff2f0d 100644 --- a/recipes/gtk+/gtk+.inc +++ b/recipes/gtk+/gtk+.inc @@ -66,6 +66,23 @@ do_install_append () { rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la } +do_install_virtclass-native () { + autotools_do_install + + mkdir -p ${D}${libdir}/gtk-2.0/include + install -m 0644 gdk/gdkconfig.h ${D}${libdir}/gtk-2.0/include/gdkconfig.h + # Copy over all headers, since the maemo stuff needs access to the private api. *sigh* + cp gtk/*.h ${D}${includedir}/gtk-2.0/gtk/ + + install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/ + + install -d ${D}${sysconfdir}/gtk-2.0 + rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la + + mkdir -p "${D}${sysconfdir}/gtk-2.0" + ${B}/gdk-pixbuf/gdk-pixbuf-query-loaders > "${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders" +} + postinst_prologue() { if [ "x$D" != "x" ]; then exit 1 diff --git a/recipes/linux-libc-headers/linux-libc-headers.inc b/recipes/linux-libc-headers/linux-libc-headers.inc index dc0267697f..0487e65fab 100644 --- a/recipes/linux-libc-headers/linux-libc-headers.inc +++ b/recipes/linux-libc-headers/linux-libc-headers.inc @@ -5,6 +5,3 @@ LICENSE = "GPL" RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" -do_install_append() { - rm -rf ${D}${includedir}/scsi -} diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb index d18be34a6e..08a871e1ce 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/readline/readline-5.2/fix-includes.patch b/recipes/readline/readline-5.2/fix-includes.patch new file mode 100644 index 0000000000..8ec398d9fe --- /dev/null +++ b/recipes/readline/readline-5.2/fix-includes.patch @@ -0,0 +1,13 @@ +Index: readline-5.2/rltypedefs.h +=================================================================== +--- readline-5.2.orig/rltypedefs.h ++++ readline-5.2/rltypedefs.h +@@ -23,6 +23,8 @@ + #ifndef _RL_TYPEDEFS_H_ + #define _RL_TYPEDEFS_H_ + ++#include <stdio.h> ++ + #ifdef __cplusplus + extern "C" { + #endif |