From ace7970ea96b21079db8c487928425d98664ae24 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Wed, 16 Jul 2014 21:45:14 +0200 Subject: Packages: libxml2: fix installed xml2-config sctipts and move it among textproc packages Signed-off-by: Abdoulaye Walsimou Gaye --- core/kconfig/packages.kconfig | 4 +++ core/mk/packages.mk | 3 ++ packages/misc/libxml/libxml.kconfig | 56 ------------------------------- packages/misc/libxml/libxml.mk | 46 ------------------------- packages/misc/misc.kconfig | 3 -- packages/misc/misc.mk | 4 --- packages/textproc/libxml2/libxml2.kconfig | 49 +++++++++++++++++++++++++++ packages/textproc/libxml2/libxml2.mk | 52 ++++++++++++++++++++++++++++ 8 files changed, 108 insertions(+), 109 deletions(-) delete mode 100644 packages/misc/libxml/libxml.kconfig delete mode 100644 packages/misc/libxml/libxml.mk create mode 100644 packages/textproc/libxml2/libxml2.kconfig create mode 100644 packages/textproc/libxml2/libxml2.mk diff --git a/core/kconfig/packages.kconfig b/core/kconfig/packages.kconfig index aa78b8e..cb47b5f 100644 --- a/core/kconfig/packages.kconfig +++ b/core/kconfig/packages.kconfig @@ -80,6 +80,10 @@ menu "System packages" source packages/system/system.kconfig endmenu +menu "Text processing packages" +source packages/textproc/textproc.kconfig +endmenu + menu "Miscellaneous packages" source packages/misc/misc.kconfig endmenu diff --git a/core/mk/packages.mk b/core/mk/packages.mk index ce1bc0b..c8e2049 100644 --- a/core/mk/packages.mk +++ b/core/mk/packages.mk @@ -77,6 +77,9 @@ include packages/security/security.mk # System packages include packages/system/system.mk +# System packages +include packages/textproc/textproc.mk + # X window system packages include packages/x11/x11.mk diff --git a/packages/misc/libxml/libxml.kconfig b/packages/misc/libxml/libxml.kconfig deleted file mode 100644 index 619516d..0000000 --- a/packages/misc/libxml/libxml.kconfig +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# Embtoolkit -# Copyright(C) 2009-2011 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 -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -################################################################################ -# -# \file libxml.kconfig -# \brief libxml.kconfig of Embtoolkit -# \author Abdoulaye Walsimou GAYE -# \date December 2009 -################################################################################ - -config EMBTK_HAVE_LIBXML2 - bool "Have libxml2" - select KEMBTK_UCLIBC_UCLIBC_HAS_FLOATS if EMBTK_CLIB_UCLIBC - select KEMBTK_UCLIBC_DO_C99_MATH if EMBTK_CLIB_UCLIBC - help - libxml2 -choice - prompt "libxml version you wish" - depends on EMBTK_HAVE_LIBXML2 - help - Here you can choose which version of libxml2 you want to use. - - 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/misc/libxml/libxml.mk deleted file mode 100644 index d903366..0000000 --- a/packages/misc/libxml/libxml.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# Embtoolkit -# 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 -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -################################################################################ -# -# \file libxml.mk -# \brief libxml.mk of Embtoolkit -# \author Abdoulaye Walsimou GAYE -# \date December 2009 -################################################################################ - -LIBXML2_NAME := libxml2 -LIBXML2_VERSION := $(call embtk_get_pkgversion,libxml2) -LIBXML2_SITE := ftp://xmlsoft.org/libxml2 -LIBXML2_PACKAGE := libxml2-$(LIBXML2_VERSION).tar.gz -LIBXML2_SRC_DIR := $(embtk_pkgb)/libxml2-$(LIBXML2_VERSION) -LIBXML2_BUILD_DIR := $(embtk_pkgb)/libxml2-$(LIBXML2_VERSION) - -LIBXML2_BINS := xml2-config xmlcatalog xmllint -LIBXML2_INCLUDES := libxml2 -LIBXML2_LIBS := libxml2* xml2Conf.sh -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 -define embtk_postinstallonce_libxml2 - sed -e 's;/usr;$(embtk_sysroot)/usr;g' \ - < $(pembtk_libxml2conf) > $(pembtk_libxml2conf).tmp; \ - mv $(pembtk_libxml2conf).tmp $(pembtk_libxml2conf) -endef 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/textproc/libxml2/libxml2.kconfig b/packages/textproc/libxml2/libxml2.kconfig new file mode 100644 index 0000000..b1166de --- /dev/null +++ b/packages/textproc/libxml2/libxml2.kconfig @@ -0,0 +1,49 @@ +################################################################################ +# Embtoolkit +# 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 +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +################################################################################ +# +# \file libxml.kconfig +# \brief libxml.kconfig of Embtoolkit +# \author Abdoulaye Walsimou GAYE +# \date December 2009 +################################################################################ + +config EMBTK_HAVE_LIBXML2 + bool "Have libxml2" + select KEMBTK_UCLIBC_UCLIBC_HAS_FLOATS if EMBTK_CLIB_UCLIBC + select KEMBTK_UCLIBC_DO_C99_MATH if EMBTK_CLIB_UCLIBC + help + libxml2 +choice + prompt "libxml version you wish" + depends on EMBTK_HAVE_LIBXML2 + help + Here you can choose which version of libxml2 you want to use. + + config EMBTK_LIBXML2_VERSION_2_7_7 + bool "libxml2-2.7.7" +endchoice + +config EMBTK_LIBXML2_VERSION_STRING + string + default "2.7.7" if EMBTK_LIBXML2_VERSION_2_7_7 + +config EMBTK_LIBXML2_NEED_PATCH + bool +config EMBTK_LIBXML2_NEED_AUTORECONF + bool diff --git a/packages/textproc/libxml2/libxml2.mk b/packages/textproc/libxml2/libxml2.mk new file mode 100644 index 0000000..9700337 --- /dev/null +++ b/packages/textproc/libxml2/libxml2.mk @@ -0,0 +1,52 @@ +################################################################################ +# Embtoolkit +# 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 +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +################################################################################ +# +# \file libxml.mk +# \brief libxml.mk of Embtoolkit +# \author Abdoulaye Walsimou GAYE +# \date December 2009 +################################################################################ + +LIBXML2_NAME := libxml2 +LIBXML2_VERSION := $(call embtk_get_pkgversion,libxml2) +LIBXML2_SITE := ftp://xmlsoft.org/libxml2 +LIBXML2_PACKAGE := libxml2-$(LIBXML2_VERSION).tar.gz +LIBXML2_SRC_DIR := $(embtk_pkgb)/libxml2-$(LIBXML2_VERSION) +LIBXML2_BUILD_DIR := $(embtk_pkgb)/libxml2-$(LIBXML2_VERSION) + +LIBXML2_BINS := xml2-config xmlcatalog xmllint +LIBXML2_INCLUDES := libxml2 +LIBXML2_LIBS := libxml2* xml2Conf.sh +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_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 -- cgit v1.2.3