mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
glib: Add 2.12.6 from OE.dev
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1254 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
@@ -0,0 +1,11 @@
|
|||||||
|
--- glib-2.8.4/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
|
||||||
|
+++ glib-2.8.4/configure.in 2006-06-05 13:34:36.000000000 +0100
|
||||||
|
@@ -1106,7 +1106,7 @@
|
||||||
|
dnl No use for this on Win32
|
||||||
|
G_MODULE_LDFLAGS=
|
||||||
|
else
|
||||||
|
- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||||||
|
+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||||||
|
fi
|
||||||
|
dnl G_MODULE_IMPL= don't reset, so cmd-line can override
|
||||||
|
G_MODULE_NEED_USCORE=0
|
||||||
@@ -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
|
||||||
+59
@@ -0,0 +1,59 @@
|
|||||||
|
--- glib/acinclude.m4 2004-05-08 11:14:46.000000000 +0100
|
||||||
|
+++ glib/acinclude.m4 2004-05-08 11:14:55.000000000 +0100
|
||||||
|
@@ -446,3 +446,56 @@
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
+dnl -*- mode: autoconf -*-
|
||||||
|
+
|
||||||
|
+# serial 1
|
||||||
|
+
|
||||||
|
+dnl Usage:
|
||||||
|
+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
|
||||||
|
+AC_DEFUN([GTK_DOC_CHECK],
|
||||||
|
+[
|
||||||
|
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||||
|
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
|
||||||
|
+ dnl for overriding the documentation installation directory
|
||||||
|
+ AC_ARG_WITH(html-dir,
|
||||||
|
+ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
|
||||||
|
+ [with_html_dir='${datadir}/gtk-doc/html'])
|
||||||
|
+ HTML_DIR="$with_html_dir"
|
||||||
|
+ AC_SUBST(HTML_DIR)
|
||||||
|
+
|
||||||
|
+ dnl enable/disable documentation building
|
||||||
|
+ AC_ARG_ENABLE(gtk-doc,
|
||||||
|
+ AC_HELP_STRING([--enable-gtk-doc],
|
||||||
|
+ [use gtk-doc to build documentation [default=no]]),,
|
||||||
|
+ enable_gtk_doc=no)
|
||||||
|
+
|
||||||
|
+ have_gtk_doc=no
|
||||||
|
+ if test -z "$PKG_CONFIG"; then
|
||||||
|
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||||
|
+ fi
|
||||||
|
+ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
|
||||||
|
+ have_gtk_doc=yes
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ dnl do we want to do a version check?
|
||||||
|
+ifelse([$1],[],,
|
||||||
|
+ [gtk_doc_min_version=$1
|
||||||
|
+ if test "$have_gtk_doc" = yes; then
|
||||||
|
+ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
|
||||||
|
+ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
|
||||||
|
+ AC_MSG_RESULT(yes)
|
||||||
|
+ else
|
||||||
|
+ AC_MSG_RESULT(no)
|
||||||
|
+ have_gtk_doc=no
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+])
|
||||||
|
+ if test x$enable_gtk_doc = xyes; then
|
||||||
|
+ if test "$have_gtk_doc" != yes; then
|
||||||
|
+ enable_gtk_doc=no
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
|
||||||
|
+ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
|
||||||
|
+])
|
||||||
+6123
File diff suppressed because it is too large
Load Diff
+6
@@ -0,0 +1,6 @@
|
|||||||
|
require glib.inc
|
||||||
|
|
||||||
|
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
|
||||||
|
file://glibconfig-sysdefs.h \
|
||||||
|
file://configure-libtool.patch;patch=1"
|
||||||
|
|
||||||
Vendored
+40
@@ -0,0 +1,40 @@
|
|||||||
|
DESCRIPTION = "GLib is a general-purpose utility library, \
|
||||||
|
which provides many useful data types, macros, \
|
||||||
|
type conversions, string utilities, file utilities, a main \
|
||||||
|
loop abstraction, and so on. It works on many \
|
||||||
|
UNIX-like platforms, Windows, OS/2 and BeOS."
|
||||||
|
LICENSE = "LGPL"
|
||||||
|
SECTION = "libs"
|
||||||
|
PRIORITY = "optional"
|
||||||
|
DEPENDS += "glib-2.0-native gtk-doc"
|
||||||
|
DEPENDS += "virtual/libiconv virtual/libintl"
|
||||||
|
PACKAGES =+ "glib-2.0-utils "
|
||||||
|
|
||||||
|
LEAD_SONAME = "libglib-2.0.*"
|
||||||
|
FILES_glib-2.0-utils = "${bindir}/*"
|
||||||
|
|
||||||
|
EXTRA_OECONF = "--disable-debug"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/glib-${PV}"
|
||||||
|
|
||||||
|
inherit autotools pkgconfig gettext
|
||||||
|
|
||||||
|
require glib-2.0.inc
|
||||||
|
|
||||||
|
acpaths = ""
|
||||||
|
do_configure_prepend () {
|
||||||
|
install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
|
||||||
|
}
|
||||||
|
|
||||||
|
do_stage () {
|
||||||
|
oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
|
||||||
|
oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
|
||||||
|
oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
|
||||||
|
oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
|
||||||
|
autotools_stage_includes
|
||||||
|
install -d ${STAGING_INCDIR}/glib-2.0/glib
|
||||||
|
install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
|
||||||
|
install -d ${STAGING_DATADIR}/aclocal
|
||||||
|
install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
|
||||||
|
install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user