[17/18] perl-xml-parser: use new patch_sub_makefile

Message ID	20180820115519.24046-18-chrismcc@gmail.com
State	Changes Requested
Headers	show Return-Path: <buildroot-bounces@busybox.net> From: Christopher McCrory <chrismcc@gmail.com> To: buildroot@buildroot.org Date: Mon, 20 Aug 2018 04:55:18 -0700 Message-Id: <20180820115519.24046-18-chrismcc@gmail.com> In-Reply-To: <20180820115519.24046-1-chrismcc@gmail.com> References: <20180820115519.24046-1-chrismcc@gmail.com> Subject: [Buildroot] [PATCH 17/18] perl-xml-parser: use new patch_sub_makefile Precedence: list Cc: Christopher McCrory <chrismcc@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net>
Series	perl modules again \| expand [00/13] perl modules again [01/18] perl-dbi: add host package [02/18] perl-dbd-mysql: new package [03/18] perl-data-dump: new package [04/18] perl-time-parsedate: new package [05/18] perl-x10: new package [06/18] perl-sys-cpu: new package [07/18] perl-dist-checkconflicts: new package [08/18] perl-package-stash: new package [09/18] perl-class-load: new package [10/18] perl-template-toolkit: new package [11/18] perl-xml-parser: new package [12/18] perl-soap-wsdl: new package [13/18] perl-time-parsedate: add license [14/18] perl-termreadkey: new package [15/18] pkg-utils.mk: patch_sub_makefile [16/18] perl-template-toolkit: use new patch_sub_makefile [17/18] perl-xml-parser: use new patch_sub_makefile [18/18] perl-soap-wsdl: add dependancy on perl-termreadkey

Message ID

20180820115519.24046-18-chrismcc@gmail.com

State

Changes Requested

Headers

From: Christopher McCrory <chrismcc@gmail.com>
To: buildroot@buildroot.org
Date: Mon, 20 Aug 2018 04:55:18 -0700
Message-Id: <20180820115519.24046-18-chrismcc@gmail.com>
In-Reply-To: <20180820115519.24046-1-chrismcc@gmail.com>
References: <20180820115519.24046-1-chrismcc@gmail.com>
Subject: [Buildroot] [PATCH 17/18] perl-xml-parser: use new
	patch_sub_makefile
Precedence: list
Cc: Christopher McCrory <chrismcc@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: buildroot-bounces@busybox.net
Sender: "buildroot" <buildroot-bounces@busybox.net>

Series

perl modules again | expand

Commit Message

Christopher McCrory Aug. 20, 2018, 11:55 a.m. UTC

Signed-off-by: Christopher McCrory <chrismcc@gmail.com>
---
 package/perl-xml-parser/perl-xml-parser.mk | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/package/perl-xml-parser/perl-xml-parser.mk b/package/perl-xml-parser/perl-xml-parser.mk
index 223c32a8a5..59e2736cf7 100644
--- a/package/perl-xml-parser/perl-xml-parser.mk
+++ b/package/perl-xml-parser/perl-xml-parser.mk
@@ -4,6 +4,8 @@ 
 #
 ################################################################################
 
+# This is the target version. libxml-parser-perl is a host only version that
+# doesn't require building host-perl.
 PERL_XML_PARSER_VERSION = 2.44
 PERL_XML_PARSER_SOURCE = XML-Parser-$(PERL_XML_PARSER_VERSION).tar.gz
 PERL_XML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR
@@ -12,21 +14,11 @@  PERL_XML_PARSER_CONF_OPTS += EXPATLIBPATH=$(TARGET_DIR)/usr/lib EXPATINCPATH=$(T
 PERL_XML_PARSER_LICENSE = Artistic or GPL-1.0+
 PERL_XML_PARSER_LICENSE_FILES = README
 
-# There has got to be a better way... :(
-# Some arguments to Makefile.PL do not get propagated to subdirectories
-# similar to:
-# https://rt.cpan.org/Public/Bug/Display.html?id=28632
-define PERL_XML_PARSER_POST_CONFIGURE_SED
-	$(SED) "s:^AR = .*:AR = $(TARGET_AR):g" $(@D)/Expat/Makefile
-	$(SED) "s:^FULL_AR = .*:FULL_AR = $(TARGET_AR):g" $(@D)/Expat/Makefile
-	$(SED) "s:^CC = .*:CC = $(TARGET_CC):g" $(@D)/Expat/Makefile
-	$(SED) "s:^CCFLAGS = .*:CCFLAGS = $(TARGET_CFLAGS):g" $(@D)/Expat/Makefile
-	$(SED) "s:^LD = .*:LD = $(TARGET_CC):g" $(@D)/Expat/Makefile
-	$(SED) "s:^LDDLFLAGS = .*:LDDLFLAGS = -shared $(TARGET_LDFLAGS):g" $(@D)/Expat/Makefile
-	$(SED) "s:^LDLFLAGS = .*:LDLFLAGS = $(TARGET_LDFLAGS):g" $(@D)/Expat/Makefile
-	$(SED) "s:^DESTDIR = .*:DESTDIR = $(TARGET_DIR):g" $(@D)/Expat/Makefile
+# Fix Expat/Makefile so it will cross-compile
+define PERL_XML_PARSER_POST_CONFIGURE_SUB_MAKEFILE
+	$(call patch_sub_makefile,$(@D)/Expat/Makefile)
 endef
 
-PERL_XML_PARSER_POST_CONFIGURE_HOOKS += PERL_XML_PARSER_POST_CONFIGURE_SED
+PERL_XML_PARSER_POST_CONFIGURE_HOOKS += PERL_XML_PARSER_POST_CONFIGURE_SUB_MAKEFILE
 
 $(eval $(perl-package))

[17/18] perl-xml-parser: use new patch_sub_makefile

Commit Message

Patch