summaryrefslogtreecommitdiffstats
path: root/meta/packages/glib-2.0
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/glib-2.0')
-rw-r--r--meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h (renamed from meta/packages/glib-2.0/files/glibconfig-sysdefs.h)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb29
-rw-r--r--meta/packages/glib-2.0/glib-2.0_2.22.3.bb6
-rw-r--r--meta/packages/glib-2.0/glib.inc4
4 files changed, 7 insertions, 32 deletions
diff --git a/meta/packages/glib-2.0/files/glibconfig-sysdefs.h b/meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h
index 1329e7f21c..1329e7f21c 100644
--- a/meta/packages/glib-2.0/files/glibconfig-sysdefs.h
+++ b/meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb b/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb
deleted file mode 100644
index 661ad360c6..0000000000
--- a/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1DESCRIPTION = "GLib is a general-purpose utility library, \
2which provides many useful data types, macros, \
3type conversions, string utilities, file utilities, a main \
4loop abstraction, and so on. It works on many \
5UNIX-like platforms, Windows, OS/2 and BeOS."
6LICENSE = "LGPL"
7SECTION = "libs"
8PRIORITY = "optional"
9DEPENDS += "gtk-doc-native"
10PR = "r1"
11
12SRC_URI = "http://download.gnome.org/sources/glib/2.22/glib-${PV}.tar.bz2 \
13 file://glib-gettextize-dir.patch;patch=1 \
14 file://configure-libtool.patch;patch=1 \
15 file://glibconfig-sysdefs.h"
16
17S = "${WORKDIR}/glib-${PV}"
18
19inherit autotools_stage pkgconfig native gettext
20
21acpaths = ""
22do_configure_prepend () {
23 install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
24}
25
26do_install_append () {
27 install -d ${D}${includedir}/glib-2.0/glib
28 install -m 0755 ${S}/glibconfig.h ${D}${includedir}/glib-2.0/glibconfig.h
29}
diff --git a/meta/packages/glib-2.0/glib-2.0_2.22.3.bb b/meta/packages/glib-2.0/glib-2.0_2.22.3.bb
index eae43de0ed..26d91a9cfa 100644
--- a/meta/packages/glib-2.0/glib-2.0_2.22.3.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.22.3.bb
@@ -1,7 +1,11 @@
1require glib.inc 1require glib.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-${PV}.tar.bz2 \ 5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-${PV}.tar.bz2 \
6 file://glibconfig-sysdefs.h \ 6 file://glibconfig-sysdefs.h \
7 file://configure-libtool.patch;patch=1" 7 file://configure-libtool.patch;patch=1"
8
9SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch;patch=1"
10
11BBCLASSEXTEND = "native"
diff --git a/meta/packages/glib-2.0/glib.inc b/meta/packages/glib-2.0/glib.inc
index c513df09d3..00f113f530 100644
--- a/meta/packages/glib-2.0/glib.inc
+++ b/meta/packages/glib-2.0/glib.inc
@@ -6,8 +6,8 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
6LICENSE = "LGPL" 6LICENSE = "LGPL"
7SECTION = "libs" 7SECTION = "libs"
8PRIORITY = "optional" 8PRIORITY = "optional"
9DEPENDS += "glib-2.0-native gtk-doc-native gettext" 9DEPENDS = "glib-2.0-native gtk-doc-native virtual/libiconv virtual/libintl"
10DEPENDS += "virtual/libiconv virtual/libintl" 10DEPENDS_virtclass-native = "gtk-doc-native"
11PACKAGES =+ "glib-2.0-utils " 11PACKAGES =+ "glib-2.0-utils "
12 12
13LEAD_SONAME = "libglib-2.0.*" 13LEAD_SONAME = "libglib-2.0.*"