From patchwork Wed Mar 17 06:01:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Dahl X-Patchwork-Id: 1454440 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=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F0fny4R4jz9sVb for ; Wed, 17 Mar 2021 17:07:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 80FBF6F6B2; Wed, 17 Mar 2021 06:07:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kFnekCilqzYK; Wed, 17 Mar 2021 06:07:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id AB430605B7; Wed, 17 Mar 2021 06:07:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BA9591BF403 for ; Wed, 17 Mar 2021 06:07:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A72084ED24 for ; Wed, 17 Mar 2021 06:07:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 40oapKlrIEbJ for ; Wed, 17 Mar 2021 06:07:25 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.10]) by smtp4.osuosl.org (Postfix) with ESMTPS id CCE0A4ED1A for ; Wed, 17 Mar 2021 06:07:24 +0000 (UTC) Received: from methusalix.internal.home.lespocky.de ([92.117.50.74]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N17cq-1lpVec1lXu-012U6d; Wed, 17 Mar 2021 07:02:08 +0100 Received: from lemmy.internal.home.lespocky.de ([192.168.243.175] helo=lemmy.home.lespocky.de) by methusalix.internal.home.lespocky.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1lMPFs-0008H6-T5; Wed, 17 Mar 2021 07:02:06 +0100 Received: (nullmailer pid 25073 invoked by uid 2001); Wed, 17 Mar 2021 06:02:04 -0000 From: Alexander Dahl To: buildroot@buildroot.org Date: Wed, 17 Mar 2021 07:01:45 +0100 Message-Id: <20210317060145.25009-1-post@lespocky.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Scan-Signature: 1ddb34e947fc13d7a7ced38f3cb08517 X-Provags-ID: V03:K1:PrYAXuAWV1vSNCdvV2SIG0LuSHQfMVQ8MpPUeFPLrPMq0zEWsJ2 3gbYzhZ8G9KRiYcMnZuuzH8sFe1XjtOm7CinunoWqGS9ZP6SvqVcKDPBpjm2+0iV/giy3Oz EFo3A1iMxXTZc8KPhFYdZhWNyZmc6GZNmafS/nXYYrXf4nCmEhelwDAChrm+RDQbtkLhTYJ DwQ26/AXhOJTvqkL8g+nw== X-UI-Out-Filterresults: notjunk:1;V03:K0:4RMb0YKNwCo=:tH5aTJV1nYof2gMzrXaQBG XzECW20vbg0H3lD03hfTz4wR275AZOyzNi1ztNVyOeXVr31d2GYhLuLBOHdmMg+z1UH5xIk+N zGYkUhbHr0K2/qFl5lMRq+og18GnoBNVmFj5B/ZP5BMUaXLEYD1u/rW7E6NDLCnBK72X7pHdp 10O+bwzFSkp4hL8hkV4aUrdMd7+aHo0RrDnEjJWm94/FosyKc2GVCLVOUpbP+Sijrpr+kGdzZ 2jRIIdD+rD2trGtHpYTvYvz/LBsdbydwEOdhOhn5d7nidc4xIGWGE/q8OH8P1LGm8jniyUk8g zFEukQ9dtgQqSDisu243Aupny08YHYBDD0bcoo9/gIfh0vS4ce6tWybfhg1LmRrKilICBVOLY yYVY5Pp0xSf5NJeDqQPUhHSWVI6K3iDC6wpQKsWpAiQCcKuJrU8Sv4w0HubEANhZ5I5zVkN7Q 83UFEcwbhA== Subject: [Buildroot] [PATCH] package/squid: Use external libltdl 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: Alexander Dahl , "Yann E . MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When enabling BR2_PACKAGE_LIBTOOL it depended on the build order if squid used the external libltdl or built it from its internal copy. That broke the build in fli4l where we have additional post build checks analyzing runtime dependencies and a separate step for copying build artefacts to target packages. Depend on the external libltdl unconditionally like done with commit 3efc5a250c1c ("package/siproxd: new package") for package siproxd recently as well. For reproducibility, size, and security. Link: https://web.nettworks.org/ci/job/fli4l/job/buildroot/job/4.0/job/trunk-sunxi/672/ Suggested-by: Yann E. MORIN Signed-off-by: Alexander Dahl --- package/squid/Config.in | 1 + package/squid/squid.mk | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) base-commit: 54d3d94b6e3846447b5796ef8587b08b537cd348 diff --git a/package/squid/Config.in b/package/squid/Config.in index 726160b01d..0df2aedef6 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_SQUID # needs fork() depends on BR2_USE_MMU select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_LIBTOOL select BR2_PACKAGE_LIBXML2 help Caching proxy for the Web supporting HTTP, HTTPS, FTP, and diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 473af2ac12..a3ccbbcf8e 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -10,7 +10,7 @@ SQUID_SITE = http://www.squid-cache.org/Versions/v4 SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING SQUID_CPE_ID_VENDOR = squid-cache -SQUID_DEPENDENCIES = libcap host-libcap libxml2 host-pkgconf \ +SQUID_DEPENDENCIES = libcap host-libcap libtool libxml2 host-pkgconf \ $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) SQUID_CONF_ENV = \ ac_cv_epoll_works=yes \ @@ -33,6 +33,8 @@ SQUID_CONF_OPTS = \ --enable-auth-ntlm="fake" \ --disable-strict-error-checking \ --enable-external-acl-helpers="file_userip" \ + --disable-ltdl-install \ + --without-included-ltdl \ --with-logdir=/var/log/squid/ \ --with-pidfile=/var/run/squid.pid \ --with-swapdir=/var/cache/squid/ \