From patchwork Mon Aug 20 11:55:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher McCrory X-Patchwork-Id: 959633 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EfC1vlfj"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vC2D2hGCz9s3C for ; Mon, 20 Aug 2018 21:56:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id ECDCB86DE1; Mon, 20 Aug 2018 11:56:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tYzi5AuYzBAC; Mon, 20 Aug 2018 11:56:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EEE2C86D91; Mon, 20 Aug 2018 11:56:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AE29C1C0550 for ; Mon, 20 Aug 2018 11:56:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A81738680E for ; Mon, 20 Aug 2018 11:56:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IWXmERMA57cd for ; Mon, 20 Aug 2018 11:56:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by whitealder.osuosl.org (Postfix) with ESMTPS id E31C48675A for ; Mon, 20 Aug 2018 11:55:52 +0000 (UTC) Received: by mail-pg1-f174.google.com with SMTP id v66-v6so5338146pgb.10 for ; Mon, 20 Aug 2018 04:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gtbl/Kg9M64dktE1/2Vc5tb1ZUnF+htYQxWGYHQe+NE=; b=EfC1vlfjYEpO48jlQkBeAzhefPdVWkOP4CNDwmgesud321ToGQ6jJNV/YvMGxa3psR CrhTd/pz8lMUcAkh9GzplpUpPMIYYhMYzpnL3PrUXiYL9Tgn3cqyJVtfDN0/pggSBeZ1 KDT1c4EL858iP8p6tq/tbrDh4ekPOsbo4GJfSKBbwDyyfd1Db07kr2R6dAwlkSdRlN7O jF5NQeN9mKEGLejlY3s2sfbz0OabxtcuOpg8p3i0967b9xLYe23UAeHUO8+USxC9xL61 rGIPIjcXlVfq4J6NAEwo1pFUmCihl+X3WJcumxgf3KCsSWqq2e/4IAdRC5h8Xkx0mJ9/ QgRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gtbl/Kg9M64dktE1/2Vc5tb1ZUnF+htYQxWGYHQe+NE=; b=BKZN5yB/8d0dbIptlIJSQtuEEHkgRU6CfrsQw5MSHwXP4KIVhJbqJywScJVi43iTSm Ej5/AJ9aswHJAY6tw8xSWZbQXq2KrY6v4mpebJbVooYI6WzwH50W8guKv03m9+sEaA2x Vs5smDJVZwho3EKnv4qR5sSCpFxScU5rG6MNUQipqc+5QdZ2ddtdQu2jIl+JbE/MYvz7 ITELkudHOFL0uf5X8JnyEdUVOz+hbWl1autkoYkoP9S0DXzz6L04qPnjK+0Od3MnmJwq KqJPiS0mLOdwsyCgxGGBQDxdTy1BMLoNQyTxr1hMdIJjv/EyqTAbXyeNk5uxp6L/HbP6 tPUw== X-Gm-Message-State: AOUpUlFgKIqv+GQBIs0VshN0lMR2inqcvHYC3YnMfEMWZCoQy7ZxQSPl aejBYVuknhlHhCWRXrudJo7UdxfQ X-Google-Smtp-Source: AA+uWPyCn5Ix+xXt3luD8q4F21K6TEq47Q7luNz9e7stZ8JhRBk6jlwfmbpSUJHvy5PTQFOb0ZkM9A== X-Received: by 2002:a62:83ca:: with SMTP id h193-v6mr47990780pfe.79.1534766152225; Mon, 20 Aug 2018 04:55:52 -0700 (PDT) Received: from localhost.localdomain ([2600:1012:b06f:afd4:7dd8:b612:92b8:cc1f]) by smtp.gmail.com with ESMTPSA id n24-v6sm15112762pfi.161.2018.08.20.04.55.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 04:55:51 -0700 (PDT) From: Christopher McCrory To: buildroot@buildroot.org Date: Mon, 20 Aug 2018 04:55:18 -0700 Message-Id: <20180820115519.24046-18-chrismcc@gmail.com> X-Mailer: git-send-email 2.14.4 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 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christopher McCrory MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Christopher McCrory --- 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))