[oe-commits] org.oe.dev merge of '4f00154cba657ea384b3472488ba540566f72326'
oe commit
openembedded-commits at lists.openembedded.org
Mon Sep 17 09:30:42 UTC 2007
merge of '4f00154cba657ea384b3472488ba540566f72326'
and 'a7779f830bacf8db2339c35075cbd1b8a1cb490d'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 059251bcbb14fb12c10fb6869143cfe44511303d
ViewMTN: http://monotone.openembedded.org/revision/info/059251bcbb14fb12c10fb6869143cfe44511303d
Files:
1
packages/gtk+/gtk+.inc
packages/gtk+/gtk+_2.12.0.bb
packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch
packages/pkgconfig/pkgconfig.inc
Diffs:
#
# mt diff -r4f00154cba657ea384b3472488ba540566f72326 -r059251bcbb14fb12c10fb6869143cfe44511303d
#
#
#
# patch "packages/gtk+/gtk+.inc"
# from [ffdca8e93dd38acb3bb2afdd28ab143a8438af91]
# to [96ca94f87b25f43f0517b4454a035d2d1c5e107c]
#
# patch "packages/gtk+/gtk+_2.12.0.bb"
# from [4b06154f496fb45640853f54b964720268a461de]
# to [08e63663afbf9b3a26edfaf43148e2e60683e7df]
#
============================================================
--- packages/gtk+/gtk+.inc ffdca8e93dd38acb3bb2afdd28ab143a8438af91
+++ packages/gtk+/gtk+.inc 96ca94f87b25f43f0517b4454a035d2d1c5e107c
@@ -1,10 +1,10 @@ PRIORITY = "optional"
DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
LICENSE = "LGPL"
PRIORITY = "optional"
-DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
inherit autotools pkgconfig
============================================================
--- packages/gtk+/gtk+_2.12.0.bb 4b06154f496fb45640853f54b964720268a461de
+++ packages/gtk+/gtk+_2.12.0.bb 08e63663afbf9b3a26edfaf43148e2e60683e7df
@@ -1,5 +1,7 @@ require gtk+.inc
require gtk+.inc
+PR = "r1"
+
DEPENDS += "cairo"
# disable per default - untested and not all patches included.
@@ -22,7 +24,7 @@ SRC_URI = "http://download.gnome.org/sou
# die die die
# file://pangoxft2.10.6.diff;patch=1"
-EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
+EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
LIBV = "2.10.0"
#
# mt diff -ra7779f830bacf8db2339c35075cbd1b8a1cb490d -r059251bcbb14fb12c10fb6869143cfe44511303d
#
#
#
# add_file "packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch"
# content [d81ad979dfb003512eb32bfc73d71e68d07159fb]
#
# patch "packages/pkgconfig/pkgconfig.inc"
# from [4721122cb57ad9aec15fca1982b594f2e74d5e95]
# to [9605cd8789e993b3b4b021d69e0e9ee94821a5a5]
#
============================================================
--- packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch d81ad979dfb003512eb32bfc73d71e68d07159fb
+++ packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch d81ad979dfb003512eb32bfc73d71e68d07159fb
@@ -0,0 +1,102 @@
+Add support for PKG_CONFIG_SYSROOT_DIR to pkgconfig
+
+---
+ main.c | 5 ++++-
+ pkg-config.1 | 9 +++++++++
+ pkg.c | 14 +++++++++++++-
+ pkg.h | 3 +++
+ 4 files changed, 29 insertions(+), 2 deletions(-)
+
+Index: pkg-config-0.22/main.c
+===================================================================
+--- pkg-config-0.22.orig/main.c 2007-09-14 10:20:15.000000000 +0100
++++ pkg-config-0.22/main.c 2007-09-14 10:22:41.000000000 +0100
+@@ -46,6 +46,8 @@
+ static int want_debug_spew = 0;
+ static int want_verbose_errors = 0;
+ static int want_stdout_errors = 0;
++char *pcsysrootdir = NULL;
++
+
+ void
+ debug_spew (const char *format, ...)
+@@ -196,7 +198,7 @@ main (int argc, char **argv)
+ GString *str;
+ GSList *packages = NULL;
+ char *search_path;
+- char *pcbuilddir;
++ char *pcbuilddir;
+ const char *pkglibdir;
+ char **search_dirs;
+ char **iter;
+@@ -345,6 +347,7 @@ main (int argc, char **argv)
+ }
+ }
+ #endif
++ pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR");
+
+ pcbuilddir = getenv ("PKG_CONFIG_TOP_BUILD_DIR");
+ if (pcbuilddir)
+Index: pkg-config-0.22/pkg.c
+===================================================================
+--- pkg-config-0.22.orig/pkg.c 2007-09-14 10:20:15.000000000 +0100
++++ pkg-config-0.22/pkg.c 2007-09-14 10:22:41.000000000 +0100
+@@ -479,11 +479,23 @@ string_list_to_string (GSList *list)
+ GSList *tmp;
+ GString *str = g_string_new ("");
+ char *retval;
++ int offset=0;
+
+ tmp = list;
+ while (tmp != NULL)
+ {
+- g_string_append (str, tmp->data);
++ if (pcsysrootdir != NULL)
++ {
++ if (!strncmp(tmp->data,"-I",2) ||
++ !strncmp(tmp->data,"-L",2))
++ {
++ offset=2;
++ g_string_append_c (str,((char*)tmp->data)[0]);
++ g_string_append_c (str,((char*)tmp->data)[1]);
++ g_string_append (str,pcsysrootdir);
++ }
++ }
++ g_string_append (str, tmp->data+offset);
+ g_string_append_c (str, ' ');
+
+ tmp = g_slist_next (tmp);
+Index: pkg-config-0.22/pkg-config.1
+===================================================================
+--- pkg-config-0.22.orig/pkg-config.1 2007-09-14 10:20:15.000000000 +0100
++++ pkg-config-0.22/pkg-config.1 2007-09-14 10:23:08.000000000 +0100
+@@ -260,6 +260,15 @@ Don't strip -I/usr/include out of cflags
+ Don't strip -L/usr/lib out of libs
+
+ .TP
++.I "PKG_CONFIG_SYSROOT_DIR"
++Modify -I and -L to use the directories located in target sysroot.
++this option is usefull when crosscompiling package that use pkg-config
++to determine CFLAGS anf LDFLAGS. -I and -L are modified to point to
++the new system root. this means that a -I/usr/include/libfoo will
++become -I/var/target/usr/include/libfoo with a PKG_CONFIG_SYSROOT_DIR
++equal to /var/target (same rule apply to -L)
++
++.TP
+ .I "PKG_CONFIG_LIBDIR"
+ Replaces the default \fIpkg-config\fP search directory.
+
+Index: pkg-config-0.22/pkg.h
+===================================================================
+--- pkg-config-0.22.orig/pkg.h 2007-09-14 10:20:15.000000000 +0100
++++ pkg-config-0.22/pkg.h 2007-09-14 10:22:41.000000000 +0100
+@@ -123,6 +123,9 @@ void disable_private_libs(void);
+ /* If TRUE, do not automatically prefer uninstalled versions */
+ extern gboolean disable_uninstalled;
+
++/* string that contain environment */
++extern char* pcsysrootdir;
++
+ #ifdef G_OS_WIN32
+ /* If TRUE, do not automatically define "prefix" while
+ * parsing each .pc file */
============================================================
--- packages/pkgconfig/pkgconfig.inc 4721122cb57ad9aec15fca1982b594f2e74d5e95
+++ packages/pkgconfig/pkgconfig.inc 9605cd8789e993b3b4b021d69e0e9ee94821a5a5
@@ -5,9 +5,10 @@ LICENSE = "GPL"
seen with a single tool."
HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
+ file://sysroot-support.patch;patch=1 \
file://glibconfig-sysdefs.h"
S = "${WORKDIR}/pkg-config-${PV}/"
More information about the Openembedded-commits
mailing list