Merge pull request #828 from jow-/glib2-2.43.3-linker-fix
glib2: fix missing gobject library when linking glib-compile-resources (#826)
This commit is contained in:
commit
82e45533a9
3 changed files with 24 additions and 1 deletions
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (C) 2007-2012 OpenWrt.org
|
||||
# Copyright (C) 2007-2015 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
|
@ -21,6 +21,8 @@ HOST_BUILD_DEPENDS:=libintl/host libiconv/host libffi/host
|
|||
PKG_INSTALL:=1
|
||||
PKG_USE_MIPS16:=0
|
||||
|
||||
PKG_FIXUP:=autoreconf
|
||||
|
||||
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
|
11
libs/glib2/patches/001-automake-compat.patch
Normal file
11
libs/glib2/patches/001-automake-compat.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- a/gtk-doc.make
|
||||
+++ b/gtk-doc.make
|
||||
@@ -267,7 +267,7 @@ uninstall-local:
|
||||
#
|
||||
# Require gtk-doc when making dist
|
||||
#
|
||||
-if HAVE_GTK_DOC
|
||||
+if ENABLE_GTK_DOC
|
||||
dist-check-gtkdoc: docs
|
||||
else
|
||||
dist-check-gtkdoc:
|
10
libs/glib2/patches/100-fix-gio-linking.patch
Normal file
10
libs/glib2/patches/100-fix-gio-linking.patch
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- a/gio/Makefile.am
|
||||
+++ b/gio/Makefile.am
|
||||
@@ -695,6 +695,7 @@ bin_PROGRAMS = gio-querymodules glib-com
|
||||
|
||||
glib_compile_resources_LDADD = libgio-2.0.la \
|
||||
$(top_builddir)/gobject/libgobject-2.0.la \
|
||||
+ $(top_builddir)/gmodule/libgmodule-2.0.la \
|
||||
$(top_builddir)/glib/libglib-2.0.la \
|
||||
$(NULL)
|
||||
|
Loading…
Reference in a new issue