From 8dbab113a07ff8b3223d0c0ea24f85effbc7cc61 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 23 Feb 2014 15:17:17 +0100 Subject: [PATCH] host-perl-xml-parser: rename and refactor with perl infrastructure Even though libxml-parser-perl had a Config.in file with an option to enable it on the target, this option was hidden by a dependency on BR2_HOST_ONLY. So in practice, it was not possible to enable libxml-parser-perl on the target. This allows us to rename libxml-parser-perl to perl-xml-parser to follow the new naming convention of Perl packages, without having to introduce Config.in.legacy material. In addition to this rename, the package is converted to use the newly introduced Perl package infrastructure. Signed-off-by: Francois Perrad Tested-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- package/Config.in | 1 - package/intltool/intltool.mk | 2 +- package/libxml-parser-perl/Config.in | 10 ------ .../libxml-parser-perl/libxml-parser-perl.mk | 35 ------------------- package/metacity/metacity.mk | 2 +- package/perl-xml-parser/perl-xml-parser.mk | 17 +++++++++ 6 files changed, 19 insertions(+), 48 deletions(-) delete mode 100644 package/libxml-parser-perl/Config.in delete mode 100644 package/libxml-parser-perl/libxml-parser-perl.mk create mode 100644 package/perl-xml-parser/perl-xml-parser.mk diff --git a/package/Config.in b/package/Config.in index 087e5f47cf..543c7a64f1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -634,7 +634,6 @@ source "package/json-c/Config.in" source "package/json-glib/Config.in" source "package/libjson/Config.in" source "package/libroxml/Config.in" -source "package/libxml-parser-perl/Config.in" source "package/libxml2/Config.in" source "package/libxmlpp/Config.in" source "package/libxslt/Config.in" diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk index 58b46e6578..6b2a7040ea 100644 --- a/package/intltool/intltool.mk +++ b/package/intltool/intltool.mk @@ -9,7 +9,7 @@ INTLTOOL_SITE = https://launchpad.net/intltool/trunk/$(INTLTOOL_VERSION)/+downlo INTLTOOL_LICENSE = GPLv2+ INTLTOOL_LICENSE_FILES = COPYING -HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl +HOST_INTLTOOL_DEPENDENCIES = host-gettext host-perl-xml-parser $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/libxml-parser-perl/Config.in b/package/libxml-parser-perl/Config.in deleted file mode 100644 index bdda23637b..0000000000 --- a/package/libxml-parser-perl/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBXML_PARSER_PERL - bool "libxml-parser-perl" - select BR2_PACKAGE_EXPAT - # Hide from configuration as we only support the host package - # for the moment - depends on BR2_HOST_ONLY - help - The Perl XML::Parser module. - - http://www.cpan.org/modules/by-module/XML/ diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk deleted file mode 100644 index 53f3bcf6ea..0000000000 --- a/package/libxml-parser-perl/libxml-parser-perl.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# libxml-parser-perl -# -################################################################################ - -LIBXML_PARSER_PERL_VERSION = 2.36 -LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz -LIBXML_PARSER_PERL_SITE = http://www.cpan.org/modules/by-module/XML/ - -LIBXML_PARSER_PERL_DEPENDENCIES = expat - -define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS - (cd $(@D) ; \ - $(HOST_CONFIGURE_OPTS) perl Makefile.PL \ - PREFIX=$(HOST_DIR)/usr \ - EXPATLIBPATH=$(HOST_DIR)/usr/lib \ - EXPATINCPATH=$(HOST_DIR)/usr/include \ - INSTALLDIRS=site \ - INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \ - INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \ - USE_MM_LD_RUN_PATH=1 \ - ) -endef - -define HOST_LIBXML_PARSER_PERL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index 9306b00207..18f5c7641d 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -19,7 +19,7 @@ METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \ METACITY_DEPENDENCIES = libgtk2 \ xlib_libX11 \ - host-libxml-parser-perl \ + host-perl-xml-parser \ xlib_libXcomposite \ xlib_libXfixes \ xlib_libXrender \ diff --git a/package/perl-xml-parser/perl-xml-parser.mk b/package/perl-xml-parser/perl-xml-parser.mk new file mode 100644 index 0000000000..fb9bf0f600 --- /dev/null +++ b/package/perl-xml-parser/perl-xml-parser.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# perl-xml-parser +# +################################################################################ + +PERL_XML_PARSER_VERSION = 2.41 +PERL_XML_PARSER_SOURCE = XML-Parser-$(PERL_XML_PARSER_VERSION).tar.gz +PERL_XML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR/ +PERL_XML_PARSER_DEPENDENCIES = expat +PERL_XML_PARSER_LICENSE = Artistic or GPLv1+ + +HOST_LIBXML_PARSER_PERL_CONF_OPT = \ + EXPATLIBPATH=$(HOST_DIR)/usr/lib \ + EXPATINCPATH=$(HOST_DIR)/usr/include + +$(eval $(host-perl-package)) -- 2.30.2