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

libxml-parser-perl: restore it like before perl infra 



intltool uses this package,
and we don't want that it depends on host-perl,
but on system perl

Signed-off-by: default avatarFrancois Perrad <francois.perrad@gadz.org>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 841c63ce

package/intltool/intltool.mk

+4 −1
Original line number Diff line number Diff line
@@ -9,7 +9,10 @@ INTLTOOL_SITE = https://launchpad.net/intltool/trunk/$(INTLTOOL_VERSION)/+downlo 
INTLTOOL_LICENSE = GPLv2+

INTLTOOL_LICENSE_FILES = COPYING



HOST_INTLTOOL_DEPENDENCIES = host-gettext host-perl-xml-parser

HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl

HOST_INTLTOOL_CONF_OPTS = \

	PERL=`which perl` \

	PERL5LIB=$(HOST_DIR)/usr/lib/perl



$(eval $(autotools-package))

$(eval $(host-autotools-package))

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

0 → 100644
+34 −0
Original line number Diff line number Diff line 
################################################################################

#

# libxml-parser-perl

#

################################################################################



LIBXML_PARSER_PERL_VERSION = 2.41

LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz

LIBXML_PARSER_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR

LIBXML_PARSER_PERL_DEPENDENCIES = expat

LIBXML_PARSER_PERL_LICENSE = Artistic or GPLv1+

LIBXML_PARSER_PERL_RUN_PERL = `which perl`



define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS

 (cd $(@D) ; \

   $(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_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 \

 )

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 $(host-generic-package))

package/metacity/metacity.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ METACITY_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \ 


METACITY_DEPENDENCIES = libgtk2 \

	xlib_libX11 \

	host-perl-xml-parser \

	host-libxml-parser-perl \

	xlib_libXcomposite \

	xlib_libXfixes \

	xlib_libXrender \

package/perl-xml-parser/perl-xml-parser.mk

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

#

# 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_PERL_XML_PARSER_CONF_OPTS = \

	EXPATLIBPATH=$(HOST_DIR)/usr/lib \

	EXPATINCPATH=$(HOST_DIR)/usr/include



$(eval $(host-perl-package))