From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id CCn/KKn8uWrHaBAAWB0awg (envelope-from ) for ; Mon, 28 Sep 2026 01:35:37 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=foss.st.com header.i=@foss.st.com header.a=rsa-sha256 header.s=selector2 header.b=dr2ndA5e; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 919B21E033; Mon, 28 Sep 2026 01:35:37 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id DC8DF1E033 for ; Mon, 28 Sep 2026 01:35:34 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6F62B4B9DB46 for ; Mon, 28 Sep 2026 05:35:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6F62B4B9DB46 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=foss.st.com header.i=@foss.st.com header.a=rsa-sha256 header.s=selector2 header.b=dr2ndA5e Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010026.outbound.protection.outlook.com [52.101.84.26]) by sourceware.org (Postfix) with ESMTPS id 161034BA79A5; Mon, 28 Sep 2026 05:33:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 161034BA79A5 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=foss.st.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 161034BA79A5 Authentication-Results: sourceware.org; arc=pass smtp.remote-ip=52.101.84.26 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1790573608; cv=pass; b=C3gA7iSql+wJnBRnfiXXJc4OmtO2JXlYCnfjQnbnxT7kIRh48MZw6uBQrZ33HZg1NPER+TCLgOwKha9l8lCxc2HIRZ9j173CX4JNpL4mnxbB8F/baQV+MrMkncjoVC/YH+LJaXx3aN33F4+uY5XENEgNSZMJYMUjXKwral+TGMw= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1790573608; c=relaxed/simple; bh=EOayEXUflopQt///92u5oKXbZ6rmFFzxz4n6J+GLwIU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=cMBEatlnwBWfPy8pNSRHLRsY9c3Dre2mJbR30CCP7z/MJD/pwTb7hBf8JsegNLjGYRfXTVa+EKMbQaKIET/XWwJk0bcmLx5wSZw7nLb3riM4RaDEI/uReMtBve3ZJzKjsLIldJJrkyAkG4HzD/BJwuF40W4Os1ILMGR6hgKe3uU= ARC-Authentication-Results: i=2; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=foss.st.com header.i=@foss.st.com header.a=rsa-sha256 header.s=selector2 header.b=dr2ndA5e DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 161034BA79A5 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ul9g3OjTFSw10V0Tz4i33MMj5BqeeU3g5fLdC8SYLIYTQfz/iVWUQDknGkMb+5xGUfQydzB1cUk8qhFVYsnG0QfZZwvAWYf6QXE5lDqSfAZlygf8uRgtHKy+B/jq+cQD2Ch9JUKAv7T6I8BTPcJFts/SXCa+iZGw5S8gNbU11+x3wbfLPqv3Wych0axYHjucLSnUyeTGy/AwGY8fYCGqGoM19figpayg3u0PzHE7z8RWKsOKbZu9kVRa988Fk6luAFXN6R9+EOBTixcr8b2IcjLvb4GwgVDthiCWf1kgAmOpug9AV09Jz8oVXW+3ulBdZ8OSlubDy73+NKjmSMbgKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Q0D+rd9k5GusOKk7gM+/+IdWlCW4mqzH1NkixI29gZQ=; b=EYhU7/TujyPyeJ9irm52/r3WBFa1RGmJ9jORLn0U9S8Vi5Ru2sdTmkpJLMQwypAfJGqAiRxLvnPmsfcHoLVkmzLcL4VzKnrMKpMsL1aAqYUfgRiv7y6qgoEcjXPqXywUMliXLMif1zl3hsxw8EwEEQNv/VFNogADFP4tm3lMKdXsCaBLiREXDcC3Exf9UwGd3KHC4mwxaJWdOeXQ034szkT17akNX8y1uEWrDjSjJZl6z1wek82yYC3fA6vkJk7YI//S/3sYFdN87MLiykYWWtqpxHVLHlJu95yFQVvtFMPoyUbc8EZ8BoCAGDYTgrWPmD20BUzzLTToRiZ421zYAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 164.130.1.60) smtp.rcpttodomain=sourceware.org smtp.mailfrom=foss.st.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=foss.st.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q0D+rd9k5GusOKk7gM+/+IdWlCW4mqzH1NkixI29gZQ=; b=dr2ndA5eZE88QlZV3knWIwEMPNobt3OhjaCAZVgznAQgVNtj2YC945qPObq2zOJN2178iF2vLS3Zw0JUyCYpqiNxoGIMHsa1yCInY5TP4gO2mk2zyuoAg5QmB8fdOnEiCj33TPbDOBnWxDzx3bzXbsOP/x7NNZ/M3ejDn1HoO6szE2BZJbrFovGz8P8QZmaAiIrZUnjnUiu5Lk7t/S05LP30KYn+q/GL0ce4ZuFEMk7X1jlmkKcamYjG/BJNEe2j7XdXE4uMW+/HLSZrabTiI188NuSdOMZ7TggWe5Q0BQqtgyfzZX8oAFJueO7CTu/+4eNPQebExc1W+xW+vUH4ig== Received: from PAZP264CA0238.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:238::19) by DB9PR10MB6665.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:3d3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.21; Mon, 28 Sep 2026 05:33:21 +0000 Received: from ZR1PEPF0000E461.eurprd04.prod.outlook.com (2603:10a6:102:238:cafe::51) by PAZP264CA0238.outlook.office365.com (2603:10a6:102:238::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.23 via Frontend Transport; Mon, 28 Sep 2026 05:33:21 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; spf=fail (sender IP is 164.130.1.60) smtp.mailfrom=foss.st.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=foss.st.com; Received-SPF: Fail (protection.outlook.com: domain of foss.st.com does not designate 164.130.1.60 as permitted sender) receiver=protection.outlook.com; client-ip=164.130.1.60; helo=smtpO365.st.com; Received: from smtpO365.st.com (164.130.1.60) by ZR1PEPF0000E461.mail.protection.outlook.com (10.167.241.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.472.14 via Frontend Transport; Mon, 28 Sep 2026 05:33:21 +0000 Received: from STKDAG1NODE2.st.com (10.75.128.133) by smtpO365.st.com (10.250.44.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.43; Mon, 28 Sep 2026 07:39:13 +0200 Received: from jkgcxl0012.jkg.st.com (10.74.22.122) by STKDAG1NODE2.st.com (10.75.128.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.43; Mon, 28 Sep 2026 07:33:20 +0200 From: =?UTF-8?q?Torbj=C3=B6rn=20SVENSSON?= To: , CC: =?UTF-8?q?Torbj=C3=B6rn=20SVENSSON?= Subject: [PATCH v2] configure: Support --with-zstd=PATH Date: Mon, 28 Sep 2026 07:30:07 +0200 Message-ID: <20260928053309.1949979-1-torbjorn.svensson@foss.st.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.74.22.122] X-ClientProxiedBy: STKCAS1NODE1.st.com (10.75.128.134) To STKDAG1NODE2.st.com (10.75.128.133) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZR1PEPF0000E461:EE_|DB9PR10MB6665:EE_ X-MS-Office365-Filtering-Correlation-Id: 75ea807d-2771-47b5-69ab-08df1d220255 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700016|23010399003|376014|1800799024|42112799006|10067099003|11063799006|6133799003|18002099003|56012099006|13003099007; X-Microsoft-Antispam-Message-Info: c7GS7gcXqQIY0TfPyWO/+KRx+s8ZWMYSvr5Y7qFPwClneAAWKhvVHruH4ycshtBGG/P/rLPuI94n7ZA8jVAuf6PxVzXtBNdK+i3OHdpH2w6ECaHHWGWfnAkQEtWbh2rl35ri5QmGlMwaA3tMcW1PVh6PhiZkeo9oqKpXiIrAzeG4FSf4ozo7yeN7Yz8xgNt+QTgK/y/LDMEmR8+ZenPyHxSSmqmi7DJEc3ZzRcPYgWcWAEu0D1q6OgcnLMeIJQPad8qxj3TcPewSjMottrbVgobYNjJE+KSzskfEVbFHXLF/Ywf1BEWCFXO7st08jLkuUFJfMJbw9mup+M5GO8NdcOOKdAoaWymDuLtBDhDgR5sNcxk1Tu3j4p0zc2E5vGoz/9UzhjEGkk7NvD5iw+dQH/zT+f4TOYl2HXIvX+bxjLe3vd+vWirXyGCtu5P3gMpe9HzxeqvsDqvN93WgBeIlmFgSzmIdheBiUTKP5x4IpKPYwxSEYl5pGfj98JEvX9RIfxbanYMgjSH0celnfYm8mQFTPNU7Em1HaMEZ0zBmGHQX2e79ZstdjyAw6aHzyBIrBC0qLpoouIHC68E7jziNVeX4p66CT7vWRpp+3tuOqaEO6fkwZ5HdekYHRn4tQXaYwQAXCZkZmkacrWV+DtZn4n2YiMyMAyBH+RThNv9QzI0= X-Forefront-Antispam-Report: CIP:164.130.1.60; CTRY:IT; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:smtpO365.st.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(36860700016)(23010399003)(376014)(1800799024)(42112799006)(10067099003)(11063799006)(6133799003)(18002099003)(56012099006)(13003099007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HIzNRvX3s1Tr/DzrxZJ6g/2EudXiWvO4vFGzwnScH/JtcJvDHE0/nKujTtJx62Xrd98Xp7JODR3k712Ug05QbHKR+VzChTThSoJL/c9CQgm0kUH+gAugkC1Iby6mDkx8fnCwvhO2cSr0RvdhqHKs+aADIsezB5S/BHkmqgRYRAu7j7yfNbPo1uyROhwpnsZs/z+O9rGRzNNtGVeOv8qt+5kmZIZBfDmDR+TKgtwzqvfzeGnCtBnD9m4OWxNd64N1EXVj0E/GBkkJMz/jfRk8gX4kB6H6E+zrJQeeVFSMDnY6gFC3RbVo/UOKN/YzSoy4iIEdOudJ+v8AeNsEgj0VydFZnGSsaUvLAFnaqQqxlRPG0B41+dy8PdKIt00GqwpHm0msdAT6SQh+HyILKcvWlOBnfw3gS2/GjTLGnrnLdcgixMy+BCRENuntXEHxMLTB X-OriginatorOrg: foss.st.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2026 05:33:21.4383 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 75ea807d-2771-47b5-69ab-08df1d220255 X-MS-Exchange-CrossTenant-Id: 75e027c9-20d5-47d5-b82f-77d7cd041e8f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=75e027c9-20d5-47d5-b82f-77d7cd041e8f; Ip=[164.130.1.60]; Helo=[smtpO365.st.com] X-MS-Exchange-CrossTenant-AuthSource: ZR1PEPF0000E461.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB6665 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Hi, V1 can be found here: https://sourceware.org/pipermail/binutils/2026-September/151687.html Changes since v1: - Added missed changes in binutils/Makefile.am and binutils/Makefile.in - Added support for dynamic version of zstd in path Ok for trunk? Kind regards, Torbjörn -- Allow --with-zstd to specify an installation prefix. Use the headers and static library under that prefix, and reject it if it does not provide zstd 1.4.0 or newer. Regenerate the affected configure scripts. Signed-off-by: Torbjörn SVENSSON --- bfd/configure | 90 +++++++++++++++++++++++++++++++++++++++----- binutils/Makefile.am | 14 +++---- binutils/Makefile.in | 16 ++++---- binutils/configure | 90 +++++++++++++++++++++++++++++++++++++++----- config/zstd.m4 | 63 ++++++++++++++++++++++++++----- gas/configure | 90 +++++++++++++++++++++++++++++++++++++++----- gdb/configure | 90 +++++++++++++++++++++++++++++++++++++++----- gold/configure | 90 +++++++++++++++++++++++++++++++++++++++----- ld/configure | 90 +++++++++++++++++++++++++++++++++++++++----- 9 files changed, 555 insertions(+), 78 deletions(-) diff --git a/bfd/configure b/bfd/configure index a4326160c57..53ec433c0fb 100755 --- a/bfd/configure +++ b/bfd/configure @@ -1540,8 +1540,8 @@ Optional Packages: --without-libintl-prefix don't search for libintl in includedir and libdir --with-libintl-type=TYPE type of library to search for (auto/static/shared) --with-system-zlib use installed libz - --with-zstd support zstd compressed debug sections - (default=auto) + --with-zstd[=PATH] support zstd compressed debug sections, optionally + using zstd installed under PATH (default=auto) Some influential environment variables: CC C compiler command @@ -15423,7 +15423,11 @@ else fi -if test "$with_zstd" != no; then : +case $with_zstd in #( + no) : + ;; #( + yes|auto) : + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzstd >= 1.4.0" >&5 @@ -15508,17 +15512,21 @@ fi echo "$ZSTD_PKG_ERRORS" >&5 - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi else ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS @@ -15531,8 +15539,72 @@ $as_echo "#define HAVE_ZSTD 1" >>confdefs.h fi + ;; #( + *) : + + ZSTD_CFLAGS="-I$with_zstd/include" + ZSTD_LIBS="-L$with_zstd/lib -lzstd" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zstd >= 1.4.0 in $with_zstd" >&5 +$as_echo_n "checking for zstd >= 1.4.0 in $with_zstd... " >&6; } + + zstd_save_CPPFLAGS=$CPPFLAGS + zstd_save_LIBS=$LIBS + CPPFLAGS="$CPPFLAGS $ZSTD_CFLAGS" + LIBS="$ZSTD_LIBS $LIBS" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if ZSTD_VERSION_NUMBER < 10400 +# error zstd 1.4.0 or later is required +#endif + +int +main () +{ + + (void) ZSTD_compress(0, 0, 0, 0, 1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_zstd=yes +else + have_zstd=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + CPPFLAGS=$zstd_save_CPPFLAGS + LIBS=$zstd_save_LIBS + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_zstd" >&5 +$as_echo "$have_zstd" >&6; } + + if test "$have_zstd" = yes; then : + + pkg_cv_ZSTD_CFLAGS=$ZSTD_CFLAGS + pkg_cv_ZSTD_LIBS=$ZSTD_LIBS + +$as_echo "#define HAVE_ZSTD 1" >>confdefs.h + + +else + + as_fn_error $? "zstd >= 1.4.0 was not found under $with_zstd" "$LINENO" 5 fi + ;; #( + *) : + ;; +esac + + + save_CFLAGS="$CFLAGS" diff --git a/binutils/Makefile.am b/binutils/Makefile.am index edcbc67bde4..0582d9fb826 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -251,7 +251,7 @@ dllwrap_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) bfdtest1_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) bfdtest2_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) -LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL) +LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL) $(ZSTD_LIBS) size_SOURCES = size.c $(BULIBS) @@ -271,7 +271,7 @@ nm_new_SOURCES = nm.c demanguse.c $(BULIBS) objdump_SOURCES = objdump.c dwarf.c prdbg.c demanguse.c $(DEBUG_SRCS) $(BULIBS) $(ELFLIBS) EXTRA_objdump_SOURCES = od-elf32_avr.c od-macho.c od-xcoff.c od-pe.c -objdump_LDADD = $(OBJDUMP_PRIVATE_OFILES) $(OPCODES) $(LIBCTF) $(BFDLIB) $(LIBIBERTY) $(LIBINTL) $(DEBUGINFOD_LIBS) $(LIBSFRAME) +objdump_LDADD = $(OBJDUMP_PRIVATE_OFILES) $(OPCODES) $(LIBCTF) $(BFDLIB) $(LIBIBERTY) $(LIBINTL) $(ZSTD_LIBS) $(DEBUGINFOD_LIBS) $(LIBSFRAME) objdump.@OBJEXT@:objdump.c if am__fastdepCC @@ -290,11 +290,11 @@ cxxfilt_SOURCES = cxxfilt.c $(BULIBS) ar_SOURCES = arparse.y arlex.l not-ranlib.c arsup.c rename.c binemul.c \ emul_$(EMULATION).c $(BULIBS) EXTRA_ar_SOURCES = $(CFILES) -ar_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) +ar_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(ZSTD_LIBS) ranlib_SOURCES = arparse.y arlex.l is-ranlib.c arsup.c rename.c binemul.c \ emul_$(EMULATION).c $(BULIBS) -ranlib_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) +ranlib_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(ZSTD_LIBS) addr2line_SOURCES = addr2line.c $(BULIBS) @@ -485,7 +485,7 @@ srconv_SOURCES = srconv.c coffgrok.c $(BULIBS) srconv.@OBJEXT@: sysroff.c dlltool_SOURCES = dlltool.c defparse.y deflex.l $(BULIBS) -dlltool_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) +dlltool_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(ZSTD_LIBS) dlltool.@OBJEXT@: if am__fastdepCC @@ -518,11 +518,11 @@ sysdump.@OBJEXT@: sysroff.c windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.c \ winduni.c resres.c $(BULIBS) -windres_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(LIBICONV) +windres_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(LIBICONV) $(ZSTD_LIBS) windmc_SOURCES = windmc.c mcparse.y mclex.c \ winduni.c $(BULIBS) -windmc_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(LIBICONV) +windmc_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(LIBICONV) $(ZSTD_LIBS) dllwrap_SOURCES = dllwrap.c version.c dllwrap_LDADD = $(LIBIBERTY) $(LIBINTL) diff --git a/binutils/Makefile.in b/binutils/Makefile.in index fff4565e302..69f6a1e128c 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -282,7 +282,7 @@ am__dirstamp = $(am__leading_dot)dirstamp testsuite_gentestdlls_OBJECTS = testsuite/gentestdlls.$(OBJEXT) testsuite_gentestdlls_LDADD = $(LDADD) testsuite_gentestdlls_DEPENDENCIES = $(BFDLIB) $(LIBIBERTY) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_windmc_OBJECTS = windmc.$(OBJEXT) mcparse.$(OBJEXT) mclex.$(OBJEXT) \ winduni.$(OBJEXT) $(am__objects_1) windmc_OBJECTS = $(am_windmc_OBJECTS) @@ -794,7 +794,7 @@ elfedit_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) dllwrap_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) bfdtest1_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) bfdtest2_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) -LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL) +LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL) $(ZSTD_LIBS) size_SOURCES = size.c $(BULIBS) objcopy_SOURCES = not-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS) strings_SOURCES = strings.c $(BULIBS) @@ -806,31 +806,31 @@ strip_new_SOURCES = is-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS) nm_new_SOURCES = nm.c demanguse.c $(BULIBS) objdump_SOURCES = objdump.c dwarf.c prdbg.c demanguse.c $(DEBUG_SRCS) $(BULIBS) $(ELFLIBS) EXTRA_objdump_SOURCES = od-elf32_avr.c od-macho.c od-xcoff.c od-pe.c -objdump_LDADD = $(OBJDUMP_PRIVATE_OFILES) $(OPCODES) $(LIBCTF) $(BFDLIB) $(LIBIBERTY) $(LIBINTL) $(DEBUGINFOD_LIBS) $(LIBSFRAME) +objdump_LDADD = $(OBJDUMP_PRIVATE_OFILES) $(OPCODES) $(LIBCTF) $(BFDLIB) $(LIBIBERTY) $(LIBINTL) $(ZSTD_LIBS) $(DEBUGINFOD_LIBS) $(LIBSFRAME) cxxfilt_SOURCES = cxxfilt.c $(BULIBS) ar_SOURCES = arparse.y arlex.l not-ranlib.c arsup.c rename.c binemul.c \ emul_$(EMULATION).c $(BULIBS) EXTRA_ar_SOURCES = $(CFILES) -ar_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) +ar_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(ZSTD_LIBS) ranlib_SOURCES = arparse.y arlex.l is-ranlib.c arsup.c rename.c binemul.c \ emul_$(EMULATION).c $(BULIBS) -ranlib_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) +ranlib_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(ZSTD_LIBS) addr2line_SOURCES = addr2line.c $(BULIBS) srconv_SOURCES = srconv.c coffgrok.c $(BULIBS) dlltool_SOURCES = dlltool.c defparse.y deflex.l $(BULIBS) -dlltool_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) +dlltool_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(ZSTD_LIBS) coffdump_SOURCES = coffdump.c coffgrok.c $(BULIBS) sysdump_SOURCES = sysdump.c $(BULIBS) windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.c \ winduni.c resres.c $(BULIBS) -windres_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(LIBICONV) +windres_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(LIBICONV) $(ZSTD_LIBS) windmc_SOURCES = windmc.c mcparse.y mclex.c \ winduni.c $(BULIBS) -windmc_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(LIBICONV) +windmc_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(LIBICONV) $(ZSTD_LIBS) dllwrap_SOURCES = dllwrap.c version.c dllwrap_LDADD = $(LIBIBERTY) $(LIBINTL) EXTRA_DIST = arparse.c arparse.h arlex.c sysinfo.c sysinfo.h \ diff --git a/binutils/configure b/binutils/configure index ea19d09749f..14b28d0df20 100755 --- a/binutils/configure +++ b/binutils/configure @@ -1540,8 +1540,8 @@ Optional Packages: --without-libintl-prefix don't search for libintl in includedir and libdir --with-libintl-type=TYPE type of library to search for (auto/static/shared) --with-system-zlib use installed libz - --with-zstd support zstd compressed debug sections - (default=auto) + --with-zstd[=PATH] support zstd compressed debug sections, optionally + using zstd installed under PATH (default=auto) --with-msgpack Enable msgpack support (auto/yes/no) Some influential environment variables: @@ -15873,7 +15873,11 @@ else fi -if test "$with_zstd" != no; then : +case $with_zstd in #( + no) : + ;; #( + yes|auto) : + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzstd >= 1.4.0" >&5 @@ -15958,17 +15962,21 @@ fi echo "$ZSTD_PKG_ERRORS" >&5 - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi else ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS @@ -15981,8 +15989,72 @@ $as_echo "#define HAVE_ZSTD 1" >>confdefs.h fi + ;; #( + *) : + + ZSTD_CFLAGS="-I$with_zstd/include" + ZSTD_LIBS="-L$with_zstd/lib -lzstd" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zstd >= 1.4.0 in $with_zstd" >&5 +$as_echo_n "checking for zstd >= 1.4.0 in $with_zstd... " >&6; } + + zstd_save_CPPFLAGS=$CPPFLAGS + zstd_save_LIBS=$LIBS + CPPFLAGS="$CPPFLAGS $ZSTD_CFLAGS" + LIBS="$ZSTD_LIBS $LIBS" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if ZSTD_VERSION_NUMBER < 10400 +# error zstd 1.4.0 or later is required +#endif + +int +main () +{ + + (void) ZSTD_compress(0, 0, 0, 0, 1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_zstd=yes +else + have_zstd=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + CPPFLAGS=$zstd_save_CPPFLAGS + LIBS=$zstd_save_LIBS + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_zstd" >&5 +$as_echo "$have_zstd" >&6; } + + if test "$have_zstd" = yes; then : + + pkg_cv_ZSTD_CFLAGS=$ZSTD_CFLAGS + pkg_cv_ZSTD_LIBS=$ZSTD_LIBS + +$as_echo "#define HAVE_ZSTD 1" >>confdefs.h + + +else + + as_fn_error $? "zstd >= 1.4.0 was not found under $with_zstd" "$LINENO" 5 fi + ;; #( + *) : + ;; +esac + + + diff --git a/config/zstd.m4 b/config/zstd.m4 index eb34c0f36d7..49595283e81 100644 --- a/config/zstd.m4 +++ b/config/zstd.m4 @@ -8,16 +8,61 @@ dnl the same distribution terms as the rest of that program. dnl Enable features using the zstd library. AC_DEFUN([AC_ZSTD], [ AC_ARG_WITH(zstd, - [AS_HELP_STRING([--with-zstd], [support zstd compressed debug sections (default=auto)])], + [AS_HELP_STRING([--with-zstd@<:@=PATH@:>@], + [support zstd compressed debug sections, optionally using zstd installed under PATH (default=auto)])], [], [with_zstd=auto]) -AS_IF([test "$with_zstd" != no], - [PKG_CHECK_MODULES(ZSTD, [libzstd >= 1.4.0], [ - AC_DEFINE(HAVE_ZSTD, 1, [Define to 1 if zstd is enabled.]) - ], [ - if test "$with_zstd" = yes; then - AC_MSG_ERROR([--with-zstd was given, but pkgconfig/libzstd.pc is not found]) - fi - ]) +AS_CASE([$with_zstd], + [no], [], + [yes|auto], [ + PKG_CHECK_MODULES([ZSTD], [libzstd >= 1.4.0], [ + AC_DEFINE(HAVE_ZSTD, 1, [Define to 1 if zstd is enabled.]) + ], [ + AS_IF([test "$with_zstd" = yes], [ + AC_MSG_ERROR( + [--with-zstd was given, but pkgconfig/libzstd.pc is not found]) + ]) + ]) + ], + [*], [ + ZSTD_CFLAGS="-I$with_zstd/include" + ZSTD_LIBS="-L$with_zstd/lib -lzstd" + + AC_MSG_CHECKING([for zstd >= 1.4.0 in $with_zstd]) + + zstd_save_CPPFLAGS=$CPPFLAGS + zstd_save_LIBS=$LIBS + CPPFLAGS="$CPPFLAGS $ZSTD_CFLAGS" + LIBS="$ZSTD_LIBS $LIBS" + + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#if ZSTD_VERSION_NUMBER < 10400 +# error zstd 1.4.0 or later is required +#endif + ]], + [[ + (void) ZSTD_compress(0, 0, 0, 0, 1); + ]])], + [have_zstd=yes], + [have_zstd=no]) + + CPPFLAGS=$zstd_save_CPPFLAGS + LIBS=$zstd_save_LIBS + + AC_MSG_RESULT([$have_zstd]) + + AS_IF([test "$have_zstd" = yes], [ + pkg_cv_ZSTD_CFLAGS=$ZSTD_CFLAGS + pkg_cv_ZSTD_LIBS=$ZSTD_LIBS + AC_DEFINE(HAVE_ZSTD, 1, [Define to 1 if zstd is enabled.]) + ], [ + AC_MSG_ERROR([zstd >= 1.4.0 was not found under $with_zstd]) + ]) ]) + +AC_SUBST([ZSTD_CFLAGS]) +AC_SUBST([ZSTD_LIBS]) ]) diff --git a/gas/configure b/gas/configure index 8afaf2729ed..d971e0c52a5 100755 --- a/gas/configure +++ b/gas/configure @@ -1531,8 +1531,8 @@ Optional Packages: --without-libintl-prefix don't search for libintl in includedir and libdir --with-libintl-type=TYPE type of library to search for (auto/static/shared) --with-system-zlib use installed libz - --with-zstd support zstd compressed debug sections - (default=auto) + --with-zstd[=PATH] support zstd compressed debug sections, optionally + using zstd installed under PATH (default=auto) Some influential environment variables: CC C compiler command @@ -16150,7 +16150,11 @@ else fi -if test "$with_zstd" != no; then : +case $with_zstd in #( + no) : + ;; #( + yes|auto) : + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzstd >= 1.4.0" >&5 @@ -16235,17 +16239,21 @@ fi echo "$ZSTD_PKG_ERRORS" >&5 - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi else ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS @@ -16258,8 +16266,72 @@ $as_echo "#define HAVE_ZSTD 1" >>confdefs.h fi + ;; #( + *) : + + ZSTD_CFLAGS="-I$with_zstd/include" + ZSTD_LIBS="-L$with_zstd/lib -lzstd" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zstd >= 1.4.0 in $with_zstd" >&5 +$as_echo_n "checking for zstd >= 1.4.0 in $with_zstd... " >&6; } + + zstd_save_CPPFLAGS=$CPPFLAGS + zstd_save_LIBS=$LIBS + CPPFLAGS="$CPPFLAGS $ZSTD_CFLAGS" + LIBS="$ZSTD_LIBS $LIBS" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if ZSTD_VERSION_NUMBER < 10400 +# error zstd 1.4.0 or later is required +#endif + +int +main () +{ + + (void) ZSTD_compress(0, 0, 0, 0, 1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_zstd=yes +else + have_zstd=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + CPPFLAGS=$zstd_save_CPPFLAGS + LIBS=$zstd_save_LIBS + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_zstd" >&5 +$as_echo "$have_zstd" >&6; } + + if test "$have_zstd" = yes; then : + + pkg_cv_ZSTD_CFLAGS=$ZSTD_CFLAGS + pkg_cv_ZSTD_LIBS=$ZSTD_LIBS + +$as_echo "#define HAVE_ZSTD 1" >>confdefs.h + + +else + + as_fn_error $? "zstd >= 1.4.0 was not found under $with_zstd" "$LINENO" 5 fi + ;; #( + *) : + ;; +esac + + + # Support for VMS timestamps via cross compile diff --git a/gdb/configure b/gdb/configure index 810e9ed7a37..04f9e5d6209 100755 --- a/gdb/configure +++ b/gdb/configure @@ -1721,8 +1721,8 @@ Optional Packages: --with-pkgversion=PKG Use PKG in the version string in place of "GDB" --with-bugurl=URL Direct users to URL to report a bug --with-system-zlib use installed libz - --with-zstd support zstd compressed debug sections - (default=auto) + --with-zstd[=PATH] support zstd compressed debug sections, optionally + using zstd installed under PATH (default=auto) --with-iconv-bin=PATH specify where to find the iconv program --with-system-readline use installed readline library --with-jit-reader-dir=PATH @@ -26723,7 +26723,11 @@ else fi -if test "$with_zstd" != no; then : +case $with_zstd in #( + no) : + ;; #( + yes|auto) : + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzstd >= 1.4.0" >&5 @@ -26808,17 +26812,21 @@ fi echo "$ZSTD_PKG_ERRORS" >&5 - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi else ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS @@ -26831,8 +26839,72 @@ $as_echo "#define HAVE_ZSTD 1" >>confdefs.h fi + ;; #( + *) : + + ZSTD_CFLAGS="-I$with_zstd/include" + ZSTD_LIBS="-L$with_zstd/lib -lzstd" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zstd >= 1.4.0 in $with_zstd" >&5 +$as_echo_n "checking for zstd >= 1.4.0 in $with_zstd... " >&6; } + + zstd_save_CPPFLAGS=$CPPFLAGS + zstd_save_LIBS=$LIBS + CPPFLAGS="$CPPFLAGS $ZSTD_CFLAGS" + LIBS="$ZSTD_LIBS $LIBS" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if ZSTD_VERSION_NUMBER < 10400 +# error zstd 1.4.0 or later is required +#endif + +int +main () +{ + + (void) ZSTD_compress(0, 0, 0, 0, 1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_zstd=yes +else + have_zstd=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + CPPFLAGS=$zstd_save_CPPFLAGS + LIBS=$zstd_save_LIBS + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_zstd" >&5 +$as_echo "$have_zstd" >&6; } + + if test "$have_zstd" = yes; then : + + pkg_cv_ZSTD_CFLAGS=$ZSTD_CFLAGS + pkg_cv_ZSTD_LIBS=$ZSTD_LIBS + +$as_echo "#define HAVE_ZSTD 1" >>confdefs.h + + +else + + as_fn_error $? "zstd >= 1.4.0 was not found under $with_zstd" "$LINENO" 5 fi + ;; #( + *) : + ;; +esac + + + diff --git a/gold/configure b/gold/configure index a81a04f0531..fb21757c723 100755 --- a/gold/configure +++ b/gold/configure @@ -1555,8 +1555,8 @@ Optional Packages: --with-gold-ldflags=FLAGS additional link flags for gold --with-gold-ldadd=LIBS additional libraries for gold --with-system-zlib use installed libz - --with-zstd support zstd compressed debug sections - (default=auto) + --with-zstd[=PATH] support zstd compressed debug sections, optionally + using zstd installed under PATH (default=auto) Some influential environment variables: CC C compiler command @@ -9997,7 +9997,11 @@ else fi -if test "$with_zstd" != no; then : +case $with_zstd in #( + no) : + ;; #( + yes|auto) : + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzstd >= 1.4.0" >&5 @@ -10082,17 +10086,21 @@ fi echo "$ZSTD_PKG_ERRORS" >&5 - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi else ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS @@ -10105,8 +10113,72 @@ $as_echo "#define HAVE_ZSTD 1" >>confdefs.h fi + ;; #( + *) : + + ZSTD_CFLAGS="-I$with_zstd/include" + ZSTD_LIBS="-L$with_zstd/lib -lzstd" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zstd >= 1.4.0 in $with_zstd" >&5 +$as_echo_n "checking for zstd >= 1.4.0 in $with_zstd... " >&6; } + + zstd_save_CPPFLAGS=$CPPFLAGS + zstd_save_LIBS=$LIBS + CPPFLAGS="$CPPFLAGS $ZSTD_CFLAGS" + LIBS="$ZSTD_LIBS $LIBS" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if ZSTD_VERSION_NUMBER < 10400 +# error zstd 1.4.0 or later is required +#endif + +int +main () +{ + + (void) ZSTD_compress(0, 0, 0, 0, 1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_zstd=yes +else + have_zstd=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + CPPFLAGS=$zstd_save_CPPFLAGS + LIBS=$zstd_save_LIBS + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_zstd" >&5 +$as_echo "$have_zstd" >&6; } + + if test "$have_zstd" = yes; then : + + pkg_cv_ZSTD_CFLAGS=$ZSTD_CFLAGS + pkg_cv_ZSTD_LIBS=$ZSTD_LIBS + +$as_echo "#define HAVE_ZSTD 1" >>confdefs.h + + +else + + as_fn_error $? "zstd >= 1.4.0 was not found under $with_zstd" "$LINENO" 5 fi + ;; #( + *) : + ;; +esac + + + if test "$pkg_cv_ZSTD_LIBS" != ""; then HAVE_ZSTD_TRUE= diff --git a/ld/configure b/ld/configure index 4d755384c41..10628a69b73 100755 --- a/ld/configure +++ b/ld/configure @@ -1598,8 +1598,8 @@ Optional Packages: --with-xxhash use inlined libxxhash for hashing (faster) (auto/yes/no) --with-system-zlib use installed libz - --with-zstd support zstd compressed debug sections - (default=auto) + --with-zstd[=PATH] support zstd compressed debug sections, optionally + using zstd installed under PATH (default=auto) Some influential environment variables: CC C compiler command @@ -19088,7 +19088,11 @@ else fi -if test "$with_zstd" != no; then : +case $with_zstd in #( + no) : + ;; #( + yes|auto) : + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzstd >= 1.4.0" >&5 @@ -19173,17 +19177,21 @@ fi echo "$ZSTD_PKG_ERRORS" >&5 - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi + if test "$with_zstd" = yes; then : + + as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 + +fi else ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS @@ -19196,8 +19204,72 @@ $as_echo "#define HAVE_ZSTD 1" >>confdefs.h fi + ;; #( + *) : + + ZSTD_CFLAGS="-I$with_zstd/include" + ZSTD_LIBS="-L$with_zstd/lib -lzstd" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zstd >= 1.4.0 in $with_zstd" >&5 +$as_echo_n "checking for zstd >= 1.4.0 in $with_zstd... " >&6; } + + zstd_save_CPPFLAGS=$CPPFLAGS + zstd_save_LIBS=$LIBS + CPPFLAGS="$CPPFLAGS $ZSTD_CFLAGS" + LIBS="$ZSTD_LIBS $LIBS" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if ZSTD_VERSION_NUMBER < 10400 +# error zstd 1.4.0 or later is required +#endif + +int +main () +{ + + (void) ZSTD_compress(0, 0, 0, 0, 1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_zstd=yes +else + have_zstd=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + CPPFLAGS=$zstd_save_CPPFLAGS + LIBS=$zstd_save_LIBS + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_zstd" >&5 +$as_echo "$have_zstd" >&6; } + + if test "$have_zstd" = yes; then : + + pkg_cv_ZSTD_CFLAGS=$ZSTD_CFLAGS + pkg_cv_ZSTD_LIBS=$ZSTD_LIBS + +$as_echo "#define HAVE_ZSTD 1" >>confdefs.h + + +else + + as_fn_error $? "zstd >= 1.4.0 was not found under $with_zstd" "$LINENO" 5 fi + ;; #( + *) : + ;; +esac + + + # target-specific stuff: -- 2.43.0