glib-2.0: Update to 2.36
Remove automake patch that is now correctly supported upstream Codegen files have moved to glib-2.0, so correct packaging and removal. (From OE-Core rev: 0d13d9947262b09cd69bc526ea2738e50c658744) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
f1771b5bfa
commit
3040cfc8cc
|
@ -1,13 +0,0 @@
|
|||
Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691011]
|
||||
|
||||
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
|
||||
diff -Nurd glib-2.34.3/configure.ac glib-2.34.3/configure.ac
|
||||
--- glib-2.34.3/configure.ac 2012-11-26 19:10:04.000000000 +0200
|
||||
+++ glib-2.34.3/configure.ac 2013-01-02 15:49:27.832183712 +0200
|
||||
@@ -291,7 +291,6 @@
|
||||
AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
|
||||
AC_LANG_RESTORE
|
||||
|
||||
-AM_PROG_CC_STDC
|
||||
AM_PROG_CC_C_O
|
||||
AC_PROG_INSTALL
|
|
@ -1,6 +1,5 @@
|
|||
require glib.inc
|
||||
|
||||
PR = "r2"
|
||||
PE = "1"
|
||||
|
||||
DEPENDS += "libffi python-argparse-native zlib"
|
||||
|
@ -12,15 +11,16 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
|
|||
SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
|
||||
file://configure-libtool.patch \
|
||||
file://glib-2.0_fix_for_x32.patch \
|
||||
file://obsolete_automake_macros.patch \
|
||||
file://fix-conflicting-rand.patch \
|
||||
file://Makefile-ptest.patch \
|
||||
file://run-ptest \
|
||||
"
|
||||
SRC_URI[md5sum] = "a4ca31e258273c3761e3de2edd607661"
|
||||
SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7"
|
||||
|
||||
SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
|
||||
|
||||
SRC_URI[md5sum] = "2047dff287473450593edecb18f79c17"
|
||||
SRC_URI[sha256sum] = "455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
RDEPENDS_${PN}-ptest += "\
|
||||
|
@ -50,8 +50,8 @@ do_configure_prepend() {
|
|||
|
||||
do_install_append() {
|
||||
# remove some unpackaged files
|
||||
rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyc
|
||||
rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyo
|
||||
rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc
|
||||
rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo
|
||||
# and empty dirs
|
||||
rm -rf ${D}${libdir}/gio
|
||||
|
|
@ -38,7 +38,7 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \
|
|||
${libdir}/gio/modules/*.la"
|
||||
FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \
|
||||
${libdir}/gio/modules/.debug"
|
||||
FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py"
|
||||
FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py"
|
||||
FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \
|
||||
${datadir}/bash-completion"
|
||||
|
||||
|
|
Loading…
Reference in New Issue