summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-31 00:21:57 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-12-31 00:21:57 +0000
commitfd37f9451a9b5e71c3ad2ffaa27fd9ff8c199428 (patch)
tree8c896ef82aba80555932eab946c72226b9f503ed
parentd1b0e1e055090f5e0f82ec70d5c760114a0dd3a8 (diff)
downloadpoky-fd37f9451a9b5e71c3ad2ffaa27fd9ff8c199428.tar.gz
glib-2.0: Drop old version
-rw-r--r--meta/packages/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch34
-rw-r--r--meta/packages/glib-2.0/glib-2.0-2.16.5/glib-gettextize-dir.patch11
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native_2.16.5.bb51
-rw-r--r--meta/packages/glib-2.0/glib-2.0_2.16.5.bb7
4 files changed, 0 insertions, 103 deletions
diff --git a/meta/packages/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch
deleted file mode 100644
index 3ba79b8986..0000000000
--- a/meta/packages/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1# Poky renames libtool to $host_alias-libtool.
2# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2
3# so we can't call # it at this point. We can safely assume a version is available
4# from PATH though
5
6--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
7+++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100
8@@ -1174,7 +1174,7 @@
9 G_MODULE_LDFLAGS=
10 else
11 export SED
12- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
13+ G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
14 fi
15 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
16 G_MODULE_NEED_USCORE=0
17@@ -1265,7 +1265,7 @@
18 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
19 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
20 echo "void glib_plugin_test(void) { }" > plugin.c
21- ${SHELL} ./libtool --mode=compile ${CC} -shared \
22+ ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \
23 -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
24 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
25 glib_cv_rtldglobal_broken,[
26@@ -1339,7 +1339,7 @@
27
28 AC_MSG_CHECKING(for the suffix of shared libraries)
29 export SED
30-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
31+shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='`
32 eval $shrext_cmds
33 module=yes eval std_shrext=$shrext_cmds
34 # chop the initial dot
diff --git a/meta/packages/glib-2.0/glib-2.0-2.16.5/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.16.5/glib-gettextize-dir.patch
deleted file mode 100644
index efe3325578..0000000000
--- a/meta/packages/glib-2.0/glib-2.0-2.16.5/glib-gettextize-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- glib-2.10.3/glib-gettextize.in.old 2006-06-21 12:46:45.000000000 +0100
2+++ glib-2.10.3/glib-gettextize.in 2006-06-21 12:48:14.000000000 +0100
3@@ -49,7 +49,7 @@
4 ;;
5 esac
6
7-gettext_dir=$prefix/share/glib-2.0/gettext
8+gettext_dir=@datadir@/glib-2.0/gettext
9
10 while test $# -gt 0; do
11 case "$1" in
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.16.5.bb b/meta/packages/glib-2.0/glib-2.0-native_2.16.5.bb
deleted file mode 100644
index e47816a056..0000000000
--- a/meta/packages/glib-2.0/glib-2.0-native_2.16.5.bb
+++ /dev/null
@@ -1,51 +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 = "r4"
11
12SRC_URI = "http://download.gnome.org/sources/glib/2.16/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 pkgconfig native gettext
20
21FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glib-2.0-${PV}"
22
23acpaths = ""
24do_configure_prepend () {
25 install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
26}
27
28do_stage () {
29 install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
30 install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
31 install -m 0755 glib-gettextize ${STAGING_BINDIR}/
32 oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
33 oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
34 oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
35 oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
36 oe_libinstall -so -C gio libgio-2.0 ${STAGING_LIBDIR}
37 autotools_stage_includes
38 install -d ${STAGING_INCDIR}/glib-2.0/glib
39 install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
40 install -d ${STAGING_DATADIR}/aclocal
41 install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
42 install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
43 install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
44 install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
45 install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
46}
47
48do_install () {
49 :
50}
51
diff --git a/meta/packages/glib-2.0/glib-2.0_2.16.5.bb b/meta/packages/glib-2.0/glib-2.0_2.16.5.bb
deleted file mode 100644
index 0a009e6da2..0000000000
--- a/meta/packages/glib-2.0/glib-2.0_2.16.5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require glib.inc
2
3PR = "r2"
4
5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
6 file://glibconfig-sysdefs.h \
7 file://configure-libtool.patch;patch=1"