Commit d0e5eb28 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

libxml-parser-perl: fix host-intltool breakage when microperl is enabled



Microperl will build host-microperl and install it into HOST_DIR/usr/bin,
where other packages will pick it up as _CONFIGURE_OPTS / _MAKE_ENV
prepends that to the path.

libxml-parser-perl didn't though, so it would still be built against
the system perl, causing host-intltool to fail when it would use
host-microperl together with libxml-parser-perl if the system perl
isn't compatible with host-microperl.

Fix it by using HOST_CONFIGURE_OPTS and ensuring it is built after
(host-)microperl if enabled.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 7a70788a
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -9,9 +9,15 @@ LIBXML_PARSER_PERL_SITE:=http://www.cpan.org/modules/by-module/XML/

LIBXML_PARSER_PERL_DEPENDENCIES = expat

ifeq ($(BR2_PACKAGE_MICROPERL),y)
# microperl builds host-microperl, so ensure we build after that to build
# against host-microperl instead of the system perl
LIBXML_PARSER_PERL_DEPENDENCIES += microperl
endif

define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
 (cd $(@D) ; \
   perl Makefile.PL \
   $(HOST_CONFIGURE_OPTS) perl Makefile.PL \
        PREFIX=$(HOST_DIR)/usr \
        EXPATLIBPATH=$(HOST_DIR)/usr/lib \
        EXPATINCPATH=$(HOST_DIR)/usr/include \