lede-packages-rs

commit 9552ead51718cfd4fbe8eebc29d3234c7e1da46f
parent d6fccbddba289371a6e1d69d1e78ce5df907d34e
Author: Ted Hess <thess@kitschensync.net>
Date:   Tue, 31 May 2016 10:17:47 -0400

Merge pull request #2771 from jow-/intltool-optional-perl-xml-parser

intltool: make dependency on XML::Parser optional
Diffstat:
M
libs/intltool/Makefile
 | 
11
++---------
A
libs/intltool/patches/100-optional-perl-xml-parser.patch
 | 
22
++++++++++++++++++++++

2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/libs/intltool/Makefile b/libs/intltool/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=intltool
 PKG_LIBVER:=0.40
 PKG_VERSION:=$(PKG_LIBVER).6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNOME/intltool/$(PKG_LIBVER)
@@ -18,6 +18,7 @@ PKG_MD5SUM:=69bc0353323112f42ad4f9cf351bc3e5
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 PKG_HOST_ONLY:=1
+HOST_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
@@ -35,13 +36,5 @@ define Package/intltool/description
   file formats using GNU gettext-compatible PO files.
 endef
 
-define Require/perl-xml-parser
-  perl -e 'use XML::Parser;'
-endef
-
-$(eval $(call Require,perl-xml-parser, \
-	Please install Perl XML::Parser \
-))
-
 $(eval $(call BuildPackage,intltool))
 $(eval $(call HostBuild))
diff --git a/libs/intltool/patches/100-optional-perl-xml-parser.patch b/libs/intltool/patches/100-optional-perl-xml-parser.patch
@@ -0,0 +1,22 @@
+--- a/configure.in
++++ b/configure.in
+@@ -25,7 +25,7 @@ AC_MSG_CHECKING([for XML::Parser])
+ if `$PERL -e "require XML::Parser" 2>/dev/null`; then
+    AC_MSG_RESULT([ok])
+ else
+-   AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++   AC_MSG_RESULT([XML::Parser perl module is required for some intltool utilitities])
+ fi
+ 
+ AC_OUTPUT([
+--- a/intltool.m4
++++ b/intltool.m4
+@@ -127,7 +127,7 @@ if test "x$2" != "xno-xml"; then
+    if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+        AC_MSG_RESULT([ok])
+    else
+-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++       AC_MSG_RESULT([XML::Parser perl module is required for some intltool utilitities])
+    fi
+ fi
+