From patchwork Mon Aug 20 11:55:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher McCrory X-Patchwork-Id: 959628 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.136; helo=silver.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="RYfpaUSV"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vC1v0q5jz9s3C for ; Mon, 20 Aug 2018 21:56:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3AED322D0D; Mon, 20 Aug 2018 11:56:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a0eldg-jtSgk; Mon, 20 Aug 2018 11:55:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9414322901; Mon, 20 Aug 2018 11:55:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id DFA831C0550 for ; Mon, 20 Aug 2018 11:55:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DCFEE85BDF for ; Mon, 20 Aug 2018 11:55:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N1TWwb1GdwLf for ; Mon, 20 Aug 2018 11:55:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 646ED85B3B for ; Mon, 20 Aug 2018 11:55:51 +0000 (UTC) Received: by mail-pf1-f173.google.com with SMTP id j26-v6so6643940pfi.10 for ; Mon, 20 Aug 2018 04:55:51 -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=GZCGeL3Vb3uDEasaXOE51bIhvC6Uh0oYd50uyGFtkF4=; b=RYfpaUSVlZE8Gf+y7i0Np/We5hMWofObfz8myAE5yHgQDfj7xBVgcd9Vsr9tiSwqYy 7xFqGn9OZvNmi/cqbZpc4JNoVUE17+UDrpfCvH7xcVpDMTpBkiYDeTcvlcXzY8+iXlRF I3VEl11VJNYp3GqMUxFaxwq6CsWcS/X/3n8831O0BCAHnUXi5Jurizi0BpQYz9daDn1Q 9S0fcU+5ghIzanE/c+ZxUO94V6njMqX55Azfqmdk6XS55AK31GXfz3+6+Wo6rzqvDtes V1vEB+JiX0kAWTZJ4gJ2rMw1+IUiF/OgxeciqNR0X0JSA50iMjl7mxhb25kk3W8g8JlV SwDQ== 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=GZCGeL3Vb3uDEasaXOE51bIhvC6Uh0oYd50uyGFtkF4=; b=dIJSbmDizrR3w9ilJK0SyREcpF86nIc3VIChTIbQiKnb7JmGw8dJO5ZawxWLJtdBq1 NG8jmywHSckSmJ8ZsVvRH5K6ptieutdqp5TE0YLN6u7f29mKBOHzUWmp1wKwLbCsapUL CZLut+F7QNb0907UIDSeI4MexEDBrOeX/PAGHCdBSRtLofEMpnmP7mcdjZmFiSh55hxa bEkhi/qLdxoRhYlevkUxxDWj1XeRUdRx6jRf5Ohme2/0Xywv1NkAFEHr+H3klhG3nJ9Q cvVFf6oIQQNi7qzkaLOx2I5sqnaURB5DA788NAsnvaDk1AQVpGLaGYgEApM0jbc5RL+G mmcw== X-Gm-Message-State: AOUpUlEKpa50Tm5nQv25Un72Z+xpwhfZXEXw90JWrF37qHRrqt9BZjRK Q6bPITbWRgWHiGSaB209tRVmx7qQ X-Google-Smtp-Source: AA+uWPxuvdZaTUSt3P9JdA/xOhy1gpwlaWOHvIO8xN1AU+X+8mLiqt+SBzGwIKocUpo8XtBNhm9i1A== X-Received: by 2002:a62:7d8d:: with SMTP id y135-v6mr16291519pfc.259.1534766150762; Mon, 20 Aug 2018 04:55:50 -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.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 04:55:50 -0700 (PDT) From: Christopher McCrory To: buildroot@buildroot.org Date: Mon, 20 Aug 2018 04:55:17 -0700 Message-Id: <20180820115519.24046-17-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 16/18] perl-template-toolkit: 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-template-toolkit/perl-template-toolkit.mk | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/package/perl-template-toolkit/perl-template-toolkit.mk b/package/perl-template-toolkit/perl-template-toolkit.mk index f65d685fa1..1307c72c1f 100644 --- a/package/perl-template-toolkit/perl-template-toolkit.mk +++ b/package/perl-template-toolkit/perl-template-toolkit.mk @@ -11,21 +11,11 @@ PERL_TEMPLATE_TOOLKIT_DEPENDENCIES = perl-appconfig PERL_TEMPLATE_TOOLKIT_LICENSE = Artistic or GPL-1.0+ PERL_TEMPLATE_TOOLKIT_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_TEMPLATE_TOOLKIT_POST_CONFIGURE_SED - $(SED) "s:^AR = .*:AR = $(TARGET_AR):g" $(@D)/xs/Makefile - $(SED) "s:^FULL_AR = .*:FULL_AR = $(TARGET_AR):g" $(@D)/xs/Makefile - $(SED) "s:^CC = .*:CC = $(TARGET_CC):g" $(@D)/xs/Makefile - $(SED) "s:^CCFLAGS = .*:CCFLAGS = $(TARGET_CFLAGS):g" $(@D)/xs/Makefile - $(SED) "s:^LD = .*:LD = $(TARGET_CC):g" $(@D)/xs/Makefile - $(SED) "s:^LDDLFLAGS = .*:LDDLFLAGS = -shared $(TARGET_LDFLAGS):g" $(@D)/xs/Makefile - $(SED) "s:^LDLFLAGS = .*:LDLFLAGS = $(TARGET_LDFLAGS):g" $(@D)/xs/Makefile - $(SED) "s:^DESTDIR = .*:DESTDIR = $(TARGET_DIR):g" $(@D)/xs/Makefile +# Fix xs/Makefile so it will cross-compile +define PERL_TEMPLATE_TOOLKIT_POST_CONFIGURE_SUB_MAKEFILE + $(call patch_sub_makefile,$(@D)/xs/Makefile) endef -PERL_TEMPLATE_TOOLKIT_POST_CONFIGURE_HOOKS += PERL_TEMPLATE_TOOLKIT_POST_CONFIGURE_SED +PERL_TEMPLATE_TOOLKIT_POST_CONFIGURE_HOOKS += PERL_TEMPLATE_TOOLKIT_POST_CONFIGURE_SUB_MAKEFILE $(eval $(perl-package))