From cbe58c1e1ca9714d8dd7fcd6391a4dd45ced0936 Mon Sep 17 00:00:00 2001 From: Raymond Danks Date: Mon, 24 Jul 2006 16:07:37 +0000 Subject: glib-2.0 - Remove '-w' from perl interpreter for glib-mkenums and change interpreter to /usr/bin/env perl. - Add some files to glib-2.0-dev that don't normally get pulled in --- packages/glib-2.0/files/glib-mkenums-nowarn.patch | 8 ++++++++ packages/glib-2.0/glib-2.0-native_2.6.5.bb | 2 ++ packages/glib-2.0/glib-2.0_2.4.5.bb | 5 +++++ packages/glib-2.0/glib-2.0_2.4.6.bb | 5 +++++ packages/glib-2.0/glib-2.0_2.6.0.bb | 5 +++++ packages/glib-2.0/glib-2.0_2.6.1.bb | 5 +++++ packages/glib-2.0/glib-2.0_2.6.2.bb | 5 +++++ packages/glib-2.0/glib-2.0_2.6.3.bb | 5 +++++ packages/glib-2.0/glib-2.0_2.6.4.bb | 5 +++++ packages/glib-2.0/glib-2.0_2.8.1.bb | 5 +++++ packages/glib-2.0/glib-2.0_2.8.2.bb | 5 +++++ packages/glib-2.0/glib-2.0_2.8.4.bb | 3 ++- 12 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 packages/glib-2.0/files/glib-mkenums-nowarn.patch (limited to 'packages') diff --git a/packages/glib-2.0/files/glib-mkenums-nowarn.patch b/packages/glib-2.0/files/glib-mkenums-nowarn.patch new file mode 100644 index 0000000000..1ab6e379c2 --- /dev/null +++ b/packages/glib-2.0/files/glib-mkenums-nowarn.patch @@ -0,0 +1,8 @@ +--- glib-2.6.5/gobject/glib-mkenums.in.orig 2006-06-15 21:28:23.436946024 -0600 ++++ glib-2.6.5/gobject/glib-mkenums.in 2006-06-15 21:28:35.417124760 -0600 +@@ -1,4 +1,4 @@ +-#!@PERL_PATH@ -w ++#!@PERL_PATH@ + + # glib-mkenums.pl + # Information about the current enumeration diff --git a/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/packages/glib-2.0/glib-2.0-native_2.6.5.bb index e0cfb8b6fb..7a4d385fe9 100644 --- a/packages/glib-2.0/glib-2.0-native_2.6.5.bb +++ b/packages/glib-2.0/glib-2.0-native_2.6.5.bb @@ -10,10 +10,12 @@ MAINTAINER = "Philip Blundell " DEPENDS = "gtk-doc-native" PR = "r4" +export PERL_PATH="/usr/bin/env perl" EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \ file://glib-gettextize-dir.patch;patch=1 \ + file://glib-mkenums-nowarn.patch;patch=1 \ file://glibconfig-sysdefs.h \ file://configure-libtool.patch;patch=1" diff --git a/packages/glib-2.0/glib-2.0_2.4.5.bb b/packages/glib-2.0/glib-2.0_2.4.5.bb index 32d25876c9..bb4127f84d 100644 --- a/packages/glib-2.0/glib-2.0_2.4.5.bb +++ b/packages/glib-2.0/glib-2.0_2.4.5.bb @@ -14,6 +14,11 @@ PACKAGES =+ "glib-2.0-utils " LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" +# Add some files to glib-2.0 dev that normally don't get pulled in + +FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in" + EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \ diff --git a/packages/glib-2.0/glib-2.0_2.4.6.bb b/packages/glib-2.0/glib-2.0_2.4.6.bb index e250d34c9c..e3722a8e96 100644 --- a/packages/glib-2.0/glib-2.0_2.4.6.bb +++ b/packages/glib-2.0/glib-2.0_2.4.6.bb @@ -15,6 +15,11 @@ PR = "r4" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" +# Add some files to glib-2.0 dev that normally don't get pulled in + +FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in" + EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \ diff --git a/packages/glib-2.0/glib-2.0_2.6.0.bb b/packages/glib-2.0/glib-2.0_2.6.0.bb index 227bc8a3fc..212afa7e01 100644 --- a/packages/glib-2.0/glib-2.0_2.6.0.bb +++ b/packages/glib-2.0/glib-2.0_2.6.0.bb @@ -15,6 +15,11 @@ PR = "r1" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" +# Add some files to glib-2.0 dev that normally don't get pulled in + +FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in" + EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \ diff --git a/packages/glib-2.0/glib-2.0_2.6.1.bb b/packages/glib-2.0/glib-2.0_2.6.1.bb index 61e9abae0e..64047a865f 100644 --- a/packages/glib-2.0/glib-2.0_2.6.1.bb +++ b/packages/glib-2.0/glib-2.0_2.6.1.bb @@ -15,6 +15,11 @@ PR = "r1" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" +# Add some files to glib-2.0 dev that normally don't get pulled in + +FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in" + EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \ diff --git a/packages/glib-2.0/glib-2.0_2.6.2.bb b/packages/glib-2.0/glib-2.0_2.6.2.bb index 61e9abae0e..64047a865f 100644 --- a/packages/glib-2.0/glib-2.0_2.6.2.bb +++ b/packages/glib-2.0/glib-2.0_2.6.2.bb @@ -15,6 +15,11 @@ PR = "r1" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" +# Add some files to glib-2.0 dev that normally don't get pulled in + +FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in" + EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \ diff --git a/packages/glib-2.0/glib-2.0_2.6.3.bb b/packages/glib-2.0/glib-2.0_2.6.3.bb index 61e9abae0e..64047a865f 100644 --- a/packages/glib-2.0/glib-2.0_2.6.3.bb +++ b/packages/glib-2.0/glib-2.0_2.6.3.bb @@ -15,6 +15,11 @@ PR = "r1" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" +# Add some files to glib-2.0 dev that normally don't get pulled in + +FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in" + EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \ diff --git a/packages/glib-2.0/glib-2.0_2.6.4.bb b/packages/glib-2.0/glib-2.0_2.6.4.bb index 61e9abae0e..64047a865f 100644 --- a/packages/glib-2.0/glib-2.0_2.6.4.bb +++ b/packages/glib-2.0/glib-2.0_2.6.4.bb @@ -15,6 +15,11 @@ PR = "r1" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" +# Add some files to glib-2.0 dev that normally don't get pulled in + +FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in" + EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \ diff --git a/packages/glib-2.0/glib-2.0_2.8.1.bb b/packages/glib-2.0/glib-2.0_2.8.1.bb index f501487fb9..b3891f108b 100644 --- a/packages/glib-2.0/glib-2.0_2.8.1.bb +++ b/packages/glib-2.0/glib-2.0_2.8.1.bb @@ -15,6 +15,11 @@ PR = "r1" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" +# Add some files to glib-2.0 dev that normally don't get pulled in + +FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in" + EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \ diff --git a/packages/glib-2.0/glib-2.0_2.8.2.bb b/packages/glib-2.0/glib-2.0_2.8.2.bb index 1c06176e01..22849917d6 100644 --- a/packages/glib-2.0/glib-2.0_2.8.2.bb +++ b/packages/glib-2.0/glib-2.0_2.8.2.bb @@ -15,6 +15,11 @@ PR = "r3" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" +# Add some files to glib-2.0 dev that normally don't get pulled in + +FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in" + EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \ diff --git a/packages/glib-2.0/glib-2.0_2.8.4.bb b/packages/glib-2.0/glib-2.0_2.8.4.bb index fc22bb866e..778e3118d1 100644 --- a/packages/glib-2.0/glib-2.0_2.8.4.bb +++ b/packages/glib-2.0/glib-2.0_2.8.4.bb @@ -13,7 +13,8 @@ PR = "r2" LEAD_SONAME = "libglib-2.0.*" FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${libdir}/glib-2.0/include ${datadir}/glib-2.0/gettext" +FILES_${PN}-dev += "${libdir}/glib-2.0/include ${datadir}/glib-2.0/gettext \ + ${libdir}/glib-2.0/include/glibconfig.h" FILES_glib-2.0-utils = "${bindir}/*" EXTRA_OECONF = "--disable-debug" -- cgit v1.2.3