From patchwork Fri Apr 24 08:31:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1276272 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=hhWNePdr; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 497p0V16y5z9sSM for ; Fri, 24 Apr 2020 18:55:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DA6908870B; Fri, 24 Apr 2020 08:55: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 aQ6hTvw6YZeG; Fri, 24 Apr 2020 08:55:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id ADA35886C8; Fri, 24 Apr 2020 08:55:15 +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 ED65A1BF421 for ; Fri, 24 Apr 2020 08:55:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E9FF386F49 for ; Fri, 24 Apr 2020 08:55:13 +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 uLZSECL8kvWQ for ; Fri, 24 Apr 2020 08:55:12 +0000 (UTC) X-Greylist: delayed 00:15:24 by SQLgrey-1.7.6 Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A257A86F47 for ; Fri, 24 Apr 2020 08:55:12 +0000 (UTC) Received: by mail-ej1-f67.google.com with SMTP id rh22so6927158ejb.12 for ; Fri, 24 Apr 2020 01:55:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id; bh=Bt33MvElG8O+4YiU4bInpwr47q5pt1l9PlqxBymayOg=; b=hhWNePdrsCKaVgseccpNXY5RK6oJ8yWO9q0Jtor2gGkF9hMJ3VJKQkRNRj1pLp915b ngW3rTQIilItAT+KElxg11CGSepEL1P2vPGimruThCMo/4ec4LrPM38YJEU1AJXXmrHC 5MQPu2CTyFnnoVpTLqvkrKn6lDDqcEMhPdOl0= 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; bh=Bt33MvElG8O+4YiU4bInpwr47q5pt1l9PlqxBymayOg=; b=cUvBHKMiIQk3dyfoN1e4Z0Gm92/KpGrSzWtpaCLvqVLhRFmBJUDy7AcExpcjKjmozL tyRWZJUnkhWhVYp1J/zSku/bAvTUpB6TzfeX4hH/+wFJRpAZSmfi1gZ5oIrPrm1HJ/6I U6PQLbRKEazWzdr7G3xqmXeKqNesAsO8NMY//HS/2aQuAFGOsgxRY9v1KCPs5Kisq95L zt11DVxxSP3IGi+ThCx/HcxcEHxwjjOgui5o8Gg2zIlNxx/hnlw2ZB2kUWhp0hFxmeXb LIR5cE63ehQxpg4fJQUzl2DE82uPv4ZhHonJfr3ifOhNsWUidG2JveM/Jtm/Lixm3QjY 375Q== X-Gm-Message-State: AGi0PuYQAFBXSva8uPncNdXvICoYXUprAimL6gvFrRLOK7gchwWyTB0J NjfGU/WMyN7v9B5Bt1mi3tA3lusX6tw= X-Google-Smtp-Source: APiQypKO4FT2RM9jpgVK67j7fBQdmnbLgGsMzNzqUCFPfP59+7UGgBvXFCb481fRXChUyBcSALATDg== X-Received: by 2002:a2e:9850:: with SMTP id e16mr4887516ljj.163.1587717124821; Fri, 24 Apr 2020 01:32:04 -0700 (PDT) Received: from angelo-ThinkPad-T470p.powersoft.it (host185100179096.static.fidoka.tech. [185.100.179.96]) by smtp.gmail.com with ESMTPSA id o16sm4062320ljp.53.2020.04.24.01.32.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Apr 2020 01:32:04 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Fri, 24 Apr 2020 10:31:59 +0200 Message-Id: <1587717119-16710-1-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH] package/apache: fixing apxs path mangling X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Latest version of Apache introduce a new apxs with a slightly modified path handling logic. In order to simplify the crosscompilation, the software removes the common prefix from bin install dir and build install dir, but for this to work they both should have a common prefix. So we introduce a new regexp to fix /usr/bin to staging dir, the regexps are also fixed to replace only the exact path between double quotes.a Fixes: http://autobuild.buildroot.net/results/c41f31566974209897a3a1ec35afe2536fb248cc http://autobuild.buildroot.net/results/b93f19976ce96e79ea159c25ed74a7377c78f334 Signed-off-by: Angelo Compagnucci --- package/apache/apache.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 48a64ea..f0775e6 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -99,7 +99,8 @@ APACHE_CONF_OPTS += --disable-deflate endif define APACHE_FIX_STAGING_APACHE_CONFIG - $(SED) 's%/usr/build%$(STAGING_DIR)/usr/build%' $(STAGING_DIR)/usr/bin/apxs + $(SED) 's%"/usr/bin"%"$(STAGING_DIR)/usr/bin"%' $(STAGING_DIR)/usr/bin/apxs + $(SED) 's%"/usr/build"%"$(STAGING_DIR)/usr/build"%' $(STAGING_DIR)/usr/bin/apxs $(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' $(STAGING_DIR)/usr/build/config_vars.mk endef APACHE_POST_INSTALL_STAGING_HOOKS += APACHE_FIX_STAGING_APACHE_CONFIG