From patchwork Wed Apr 22 08:43:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1274868 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=gNAbOuhL; 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 496YrV50dBz9sPF for ; Wed, 22 Apr 2020 18:44:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8BB5E87E6D; Wed, 22 Apr 2020 08:44:05 +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 0NLVRp+9CciC; Wed, 22 Apr 2020 08:44:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B6F3087B07; Wed, 22 Apr 2020 08:44:01 +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 31DCD1BF3DF for ; Wed, 22 Apr 2020 08:44:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2DCBA860FF for ; Wed, 22 Apr 2020 08:44:00 +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 Zv8EdetqXrwD for ; Wed, 22 Apr 2020 08:43:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3F53186156 for ; Wed, 22 Apr 2020 08:43:58 +0000 (UTC) Received: by mail-lf1-f66.google.com with SMTP id l11so962261lfc.5 for ; Wed, 22 Apr 2020 01:43:58 -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=nY7Wle2RyqjbLbKP+JMqCcjRl9H/I1czff5pStB78ro=; b=gNAbOuhLQU+O909Hx06nEM+KWW1KHEchzbwvU11dPDIR2jgLpRV+xDudLYRW9hpZDO ybMBEzypanpKs/QqnyQ8WSQiI/iFgZOr5ZydHHa/57wnoVqfhaoeSxzxwAhb6WmBHBg9 KOz0AIkZiQSnttB1n6zMEvNjaqqsO4+kuyEiU= 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=nY7Wle2RyqjbLbKP+JMqCcjRl9H/I1czff5pStB78ro=; b=HtSP2KmAia3sOGC7CMHfyn8h9Y79CxyjXQvZw7keXschIjtkCZ8gPva5pcbAoSWceE I5f8cr0YAGoW+7GsXxTQrRKBTZLMG3My1/SHx0ThJsfO9veisOSNwmlEtK1ENnx3+mKy 0HFtlFNeZExYjxuCXRgcd16yhov4ddE6kka8Fssbs7hQuC1YX7oxG08wH6NplOx7DD/M JTKpuW4Cr8H9LKRZCTaCd7S9JOscK8ub2DayoiSZS+fEjNqO1E5ZhSLFqbN/NJK9345m YMTk3AeFCGtmaK5UowagntTNJFKJzrHqqJpR+COy5gTT1UxdUK8pvWKtxNTy4RDWu8mW 7LuQ== X-Gm-Message-State: AGi0PuZHhQSjAm2MEkG1h3X3M3f1DM6WHgxEIm1tHQwDbpkkFOWPQjl4 QXngodoobwNEoMVCwpkqFOJRvTyTq2c= X-Google-Smtp-Source: APiQypLEyzYP58GnEWegugMaS3oUmSzO6VbAmUciSxaMcKHBWNbCkhAntPX1fnsU0MUQKJ7bgWdw9Q== X-Received: by 2002:a05:6512:308e:: with SMTP id z14mr16643246lfd.110.1587545035668; Wed, 22 Apr 2020 01:43:55 -0700 (PDT) Received: from angelo-ThinkPad-T470p.powersoft.it (host185100179096.static.fidoka.tech. [185.100.179.96]) by smtp.gmail.com with ESMTPSA id b9sm4485938lfp.27.2020.04.22.01.43.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Apr 2020 01:43:55 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 22 Apr 2020 10:43:49 +0200 Message-Id: <1587545029-22187-1-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH] package/apache: fix apxs destdir prefix 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" Apache version 2.4.43 introduced a problem in apxs path handling. In buildroot apxs and config_vars.mk, all the paths are expressed as absolute so the trick of guessing a destdir path to prefix to all the others is not needed and produces wrong paths in the form of destdir + full path. Fixes: http://autobuild.buildroot.net/results/c41f31566974209897a3a1ec35afe2536fb248cc http://autobuild.buildroot.net/results/b93f19976ce96e79ea159c25ed74a7377c78f334 Signed-off-by: Angelo Compagnucci --- ...support-for-cross-compiling-to-apxs.-If-a.patch | 87 ++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 package/apache/0005-Revert-Add-support-for-cross-compiling-to-apxs.-If-a.patch diff --git a/package/apache/0005-Revert-Add-support-for-cross-compiling-to-apxs.-If-a.patch b/package/apache/0005-Revert-Add-support-for-cross-compiling-to-apxs.-If-a.patch new file mode 100644 index 0000000..2520a31 --- /dev/null +++ b/package/apache/0005-Revert-Add-support-for-cross-compiling-to-apxs.-If-a.patch @@ -0,0 +1,87 @@ +From 6d8eaefb733a99fa5a95d2b4a86706a7cbe12d36 Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Wed, 22 Apr 2020 10:25:22 +0200 +Subject: [PATCH] Revert "Add support for cross compiling to apxs. If apxs is + being executed from somewhere" + +This reverts commit c7d7b6d1a3b3c4b2c7ad19258fd0d388901a1c9d. + +In buildroot apxs and config_vars.mk, all the paths are expressed +as absolute so the trick of guessing a destdir path to prefix to all +the others is not needed and produces wrong paths in the form of +destdir + full path. + +Signed-off-by: Angelo Compagnucci +--- + support/apxs.in | 22 ++++++---------------- + 1 file changed, 6 insertions(+), 16 deletions(-) + +diff --git a/support/apxs.in b/support/apxs.in +index 65e1288..6ba0bf0 100644 +--- a/support/apxs.in ++++ b/support/apxs.in +@@ -23,20 +23,10 @@ package apxs; + ## Configuration + ## + +-# are we building in a cross compile environment? If so, destdir contains +-# the base directory of the cross compiled environment, otherwise destdir +-# is the empty string. +- +-my $destdir = ""; +-my $ddi = rindex($0, "@exp_bindir@"); +-if ($ddi >= 0) { +- $destdir = substr($0, 0, $ddi); +-} +- + my %config_vars = (); + + my $installbuilddir = "@exp_installbuilddir@"; +-get_config_vars($destdir . "$installbuilddir/config_vars.mk",\%config_vars); ++get_config_vars("$installbuilddir/config_vars.mk",\%config_vars); + + # read the configuration variables once + +@@ -51,10 +41,10 @@ my $CFG_CFLAGS = join ' ', map { get_vars($_) } + qw(SHLTCFLAGS CFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS); + my $CFG_LDFLAGS = join ' ', map { get_vars($_) } + qw(LDFLAGS NOTEST_LDFLAGS SH_LDFLAGS); +-my $includedir = $destdir . get_vars("includedir"); ++my $includedir = get_vars("includedir"); + my $CFG_INCLUDEDIR = eval qq("$includedir"); + my $CFG_CC = get_vars("CC"); +-my $libexecdir = $destdir . get_vars("libexecdir"); ++my $libexecdir = get_vars("libexecdir"); + my $CFG_LIBEXECDIR = eval qq("$libexecdir"); + my $sbindir = get_vars("sbindir"); + my $CFG_SBINDIR = eval qq("$sbindir"); +@@ -350,7 +340,7 @@ if ($opt_q) { + } + } + +-my $apr_config = $destdir . get_vars("APR_CONFIG"); ++my $apr_config = get_vars("APR_CONFIG"); + + if (! -x "$apr_config") { + error("$apr_config not found!"); +@@ -361,7 +351,7 @@ my $apr_major_version = (split /\./, `$apr_config --version`)[0]; + + my $apu_config = ""; + if ($apr_major_version < 2) { +- $apu_config = $destdir . get_vars("APU_CONFIG"); ++ $apu_config = get_vars("APU_CONFIG"); + + if (! -x "$apu_config") { + error("$apu_config not found!"); +@@ -516,7 +506,7 @@ if ($opt_i or $opt_e) { + # use .so unambigiously for installed shared library modules + $t =~ s|\.[^./\\]+$|\.so|; + if ($opt_i) { +- push(@cmds, $destdir . "$installbuilddir/instdso.sh SH_LIBTOOL='" . ++ push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" . + "$libtool' $f $CFG_LIBEXECDIR"); + push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); + } +-- +2.7.4 +