diff options
Diffstat (limited to 'package/glib')
| -rw-r--r-- | package/glib/Config.in | 7 | ||||
| -rw-r--r-- | package/glib/Makefile | 24 | ||||
| -rw-r--r-- | package/glib/patches/patch-gio_Makefile_in | 20 |
3 files changed, 35 insertions, 16 deletions
diff --git a/package/glib/Config.in b/package/glib/Config.in deleted file mode 100644 index 093e19649..000000000 --- a/package/glib/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config ADK_PACKAGE_GLIB - prompt "glib............................. low-level core library that forms the basis of GTK+" - tristate - default n - select ADK_PACKAGE_LIBPTHREAD - select ADK_PACKAGE_LIBICONV - select ADK_PACKAGE_GETTEXT diff --git a/package/glib/Makefile b/package/glib/Makefile index 66e3329c8..4db94344a 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,25 +4,29 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.18.1 +PKG_VERSION:= 2.22.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= d53836f7fdd9970d03e255e9d712bd83 +PKG_MD5SUM:= e699a93d62c01e0ee07caef3e11eddd8 PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= gettext libiconv libpthread +PKG_BUILDDEP+= gettext libiconv PKG_URL:= http://www.gtk.org/ -PKG_SITES:= ftp://ftp.gtk.org/pub/glib/2.18/ +PKG_SITES:= ftp://ftp.gtk.org/pub/glib/2.22/ + +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TCPPFLAGS+= -I'${STAGING_DIR}/usr/include' -CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-debug=no \ --disable-mem-pools \ --disable-rebuilds \ --with-libiconv=gnu \ + --disable-fam \ --with-threads=posix CONFIGURE_ENV+= glib_cv_long_long_format=ll \ glib_cv_stack_grows=no \ @@ -30,11 +34,13 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ glib_cv_uscore=no \ ac_cv_func_posix_getpwuid_r=yes \ ac_cv_func_posix_getgrgid_r=yes -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog post-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib - ${CP} ${WRKINST}/usr/lib/lib*.so.* ${IDIR_GLIB}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib + ${CP} ${WRKINST}/usr/lib/libglib*.so* ${IDIR_GLIB}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgobject*.so* ${IDIR_GLIB}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgmodule*.so* ${IDIR_GLIB}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgthread*.so* ${IDIR_GLIB}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/glib/patches/patch-gio_Makefile_in b/package/glib/patches/patch-gio_Makefile_in new file mode 100644 index 000000000..5eaa2eef1 --- /dev/null +++ b/package/glib/patches/patch-gio_Makefile_in @@ -0,0 +1,20 @@ +--- glib-2.22.2.orig/gio/Makefile.in 2009-10-07 15:56:29.000000000 +0200 ++++ glib-2.22.2/gio/Makefile.in 2009-10-11 11:04:35.126154998 +0200 +@@ -242,7 +242,7 @@ ETAGS = etags + CTAGS = ctags + am__tty_colors = \ + red=; grn=; lgn=; blu=; std= +-DIST_SUBDIRS = libasyncns xdgmime inotify fen win32 . fam tests ++DIST_SUBDIRS = libasyncns xdgmime inotify fen win32 . fam + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + am__relativize = \ + dir0=`pwd`; \ +@@ -489,7 +489,7 @@ EXTRA_DIST = gio-marshal.list gio.symbol + TEST_PROGS = + NULL = + SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_6) \ +- $(am__append_9) . $(am__append_12) tests ++ $(am__append_9) . $(am__append_12) + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib |