Commit 8dbab113 authored by Francois Perrad's avatar Francois Perrad Committed by Peter Korsgaard
Browse files

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: default avatarFrancois Perrad <francois.perrad@gadz.org>
Tested-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 9fbb1699

package/Config.in

+0 −1
Original line number Diff line number Diff line
@@ -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"

package/intltool/intltool.mk

+1 −1
Original line number Diff line number Diff line
@@ -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))

package/libxml-parser-perl/Config.in

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
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/

package/libxml-parser-perl/libxml-parser-perl.mk

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
################################################################################

#

# 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))

package/metacity/metacity.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 \