diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-07-16 21:45:14 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-07-16 21:45:14 +0200 |
| commit | ace7970ea96b21079db8c487928425d98664ae24 (patch) | |
| tree | 08c759a56ae011de651f8f97f2b55ac904c0e1ea /packages | |
| parent | 17c4f44b287fdc7e617422a070cb17cb97b74410 (diff) | |
| download | embtoolkit-ace7970ea96b21079db8c487928425d98664ae24.tar.gz embtoolkit-ace7970ea96b21079db8c487928425d98664ae24.tar.bz2 embtoolkit-ace7970ea96b21079db8c487928425d98664ae24.tar.xz | |
Packages: libxml2: fix installed xml2-config sctipts and move it among textproc packages
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/misc/misc.kconfig | 3 | ||||
| -rw-r--r-- | packages/misc/misc.mk | 4 | ||||
| -rw-r--r-- | packages/textproc/libxml2/libxml2.kconfig (renamed from packages/misc/libxml/libxml.kconfig) | 9 | ||||
| -rw-r--r-- | packages/textproc/libxml2/libxml2.mk (renamed from packages/misc/libxml/libxml.mk) | 8 |
4 files changed, 8 insertions, 16 deletions
diff --git a/packages/misc/misc.kconfig b/packages/misc/misc.kconfig index 3ed4364..140b63a 100644 --- a/packages/misc/misc.kconfig +++ b/packages/misc/misc.kconfig @@ -35,9 +35,6 @@ source packages/misc/glib/glib.kconfig # inttltool source packages/misc/intltool/intltool.kconfig -# libxml -source packages/misc/libxml/libxml.kconfig - # ncurses included in main Kconfig # raptor diff --git a/packages/misc/misc.mk b/packages/misc/misc.mk index 015af2e..1c1e617 100644 --- a/packages/misc/misc.mk +++ b/packages/misc/misc.mk @@ -38,10 +38,6 @@ $(call embtk_include_hostpkg,glib_host) # intltool $(call embtk_include_hostpkg,intltool_host) -# libxml2 -include packages/misc/libxml/libxml.mk -ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXML2) += libxml2_install - # ncurses $(call embtk_include_pkg,ncurses) diff --git a/packages/misc/libxml/libxml.kconfig b/packages/textproc/libxml2/libxml2.kconfig index 619516d..b1166de 100644 --- a/packages/misc/libxml/libxml.kconfig +++ b/packages/textproc/libxml2/libxml2.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE. +# Copyright(C) 2009-2014 Abdoulaye Walsimou GAYE. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,20 +37,13 @@ choice config EMBTK_LIBXML2_VERSION_2_7_7 bool "libxml2-2.7.7" - config EMBTK_LIBXML2_VERSION_2_7_6 - bool "libxml2-2.7.6" endchoice config EMBTK_LIBXML2_VERSION_STRING string default "2.7.7" if EMBTK_LIBXML2_VERSION_2_7_7 - default "2.7.6" if EMBTK_LIBXML2_VERSION_2_7_6 config EMBTK_LIBXML2_NEED_PATCH bool config EMBTK_LIBXML2_NEED_AUTORECONF bool -config EMBTK_LIBXML2_PKG_IS_TARGZ - bool -config EMBTK_LIBXML2_PKG_IS_TARBZ2 - bool diff --git a/packages/misc/libxml/libxml.mk b/packages/textproc/libxml2/libxml2.mk index d903366..9700337 100644 --- a/packages/misc/libxml/libxml.mk +++ b/packages/textproc/libxml2/libxml2.mk @@ -38,9 +38,15 @@ LIBXML2_PKGCONFIGS := libxml*.pc LIBXML2_CONFIGURE_OPTS := --without-python # FIXME: this should be fixed from upstream libxml2 -pembtk_libxml2conf := $(embtk_sysroot)/usr/$(LIBDIR)/xml2Conf.sh +pembtk_libxml2conf := $(embtk_sysroot)/usr/$(LIBDIR)/xml2Conf.sh +pembtk_xml2config := $(embtk_sysroot)/usr/bin/xml2-config define embtk_postinstallonce_libxml2 sed -e 's;/usr;$(embtk_sysroot)/usr;g' \ < $(pembtk_libxml2conf) > $(pembtk_libxml2conf).tmp; \ mv $(pembtk_libxml2conf).tmp $(pembtk_libxml2conf) + chmod +x $(pembtk_libxml2conf) + sed -e 's;=/usr;=$(embtk_sysroot)/usr;g' \ + < $(pembtk_xml2config) > $(pembtk_xml2config).tmp; \ + mv $(pembtk_xml2config).tmp $(pembtk_xml2config) + chmod +x $(pembtk_xml2config) endef |