From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id EB11F383C7D0 for ; Sun, 11 Dec 2022 00:26:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EB11F383C7D0 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BANvObo000890; Sun, 11 Dec 2022 00:26:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=1QGQKKRqRC/CjFKV2XIVosSLks8fVoVYI0+Y5u0xh2w=; b=RMcQQiTEdwFKjPRZW6IXISje3qkBmFnF5So/kE+KrcfACUoJnSJMT4Sd+2U2k4qNeJyu tdsZ/+eRTv4WTOPzsnpzoLhccBlmbe7asgUa2795gleiU69PZYtkNOzx0jEZrch9zUEh tmNohK2PgBJRmD28JYSdGo5VYDa2okOvWz781LLu6TPQOzji7vhvAN2UQu03DYEmgTp8 R5O9cQuUs/LM1wbQ2r0aN1R1IZlkzuosm18Hf2wmHP7a9Y10gGIF+W3XNQgie5NvR8Zo txHbiCiAkvR2nF239vx9GLEg5G60ahxMiqLFoxqqTh2WJ8el3xJRWTCxemPR/65xCW7z 0g== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3mcjnsrqny-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 11 Dec 2022 00:26:43 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2BAM58Kp038864; Sun, 11 Dec 2022 00:26:42 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3mcgj24xc0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 11 Dec 2022 00:26:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jub94qQxpbYutPduLKUKy0f73HtZG+w9/p3x+obyqKoEsOfxmChSO/prMR40CkEdjS4D0a9DcG1w8mdyMW1bI8BGpRngCx3xhCXWO/ExgDxHvgMTHJ0GXuk46jJQ4ZigW33yxJhmxpW5mjetFXXF6+m7o7IIlOv3FdZcQAcEe0Yi2Rqq4SN56Ct/JQteJygjNVZ0xIbg7U3t+fWuE2ozhd8Dz1OHg228uoZxtbcPL5Q2sVK/rrTgbzKsIuoQwTwN26OsV8ZhahdyrtVVTkos81lab1T9Sgs9gQRYTQvfIfe/wUHXtMoylotuiskpwbDwzRZ4LUaUkujKLfvMHA3mxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=1QGQKKRqRC/CjFKV2XIVosSLks8fVoVYI0+Y5u0xh2w=; b=gRqwynkN1eZpEXpRk8PUce3nBoKK+IyZIOIVDcPZkUUgqmVEZZ4AEfYvVdRsEx3i4VBg23g7jn4ZgeWFBw2rw7D+RQku6y/MXG/FdsOYaLd8oTVOKadATUmiQqX9qznhJr4tUsXJS854MwruX5mxR5X28AWHf1c7Fk2EYEHHVyPogc8xEba3dFH92z4F/mVzeCqELNnZoxT1YQm+7drlcX4wUpCCAobn/M+n40t0jbqmzCmcR4GoO2ynXT+eqAVXNet8oV2FxkWqq6f/eyysK4ZeJq3yAlBwyb6RZbq2OrIfukmN1o8wZYj8P5Z+nfWQ6JgYn6bIgVYlFbBNNXqXYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1QGQKKRqRC/CjFKV2XIVosSLks8fVoVYI0+Y5u0xh2w=; b=bAQF07GZXSGuUKqZwTkQZyeprMp1ZP2RJjIN0KW1KDW9/SGkGcUfoLrwYsFsph7Poa7nIzdw8zH1FNoUhWCz81yCXhG/Df4EOlntlwbGUpy5tmnLYSKChla7MkqOKWqubYzFbKkfr3VKVhuYtDSMGFCPFOqMyemQq/3NYg3EB2Y= Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by CY5PR10MB5916.namprd10.prod.outlook.com (2603:10b6:930:2c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.16; Sun, 11 Dec 2022 00:26:40 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::ee70:1952:4416:1bdc]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::ee70:1952:4416:1bdc%5]) with mapi id 15.20.5880.019; Sun, 11 Dec 2022 00:26:40 +0000 From: Indu Bhagat To: binutils@sourceware.org Cc: nick.alcock@oracle.com, vapier@gentoo.org, i@maskray.me, Indu Bhagat Subject: [PATCH] libctf: remove unnecessary zstd constructs Date: Sat, 10 Dec 2022 16:26:22 -0800 Message-Id: <20221211002622.564875-1-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.37.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MW4PR03CA0065.namprd03.prod.outlook.com (2603:10b6:303:b6::10) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|CY5PR10MB5916:EE_ X-MS-Office365-Filtering-Correlation-Id: dc5370e6-bf07-4e70-3c98-08dadb0e5f10 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JSp7DZXlJbvIYBULwgDR0hNtL9Zg3yKPanFEHOMafFAMaMRZb9dQxketrmaVNTRnQDBoIictYQMjnVdKXTXli64Ox8UHpSxqcbEfH7sVf9So1k9StMsL0QhD9lVaxqWSduN85zN4P3Mo/u5ZSjliz1tfOJOICW2Ziz7vPzBYsIJ31RwHm96b8/Zl48Ot4hGJ9nXTa9hn+BLmbsgpA7oQ02nbkUlur/GtdffoAKsb3wbtwDwbHYnEoKeRjoadP5VLt4WeIBhaRf+ip9YahPkW+eJcPhjVL1dgqZWOj6Q76KyI+DBsGm9Rff3MONdOog/rzD0/CoT3MlEHDcwk7zNMN5vI9L/JLD/flF1vSNKy3TL8g+sRj05ebUiIaGuaQkFLoLbAnK5aWq/8/wwT/vkFL+II9qRffH+uGI8k1h0JxJXkPnCPmnOjhDMlaUiQPVC9n7zxjHTdeCDCVuTuwsrYzVSejHSQeh0y5vaTWhtUrhbnLvTOS1IfUYiKJJJ8TjUh6yGDQYncFrlOwjDDa9JA7L5cVQJ6ip6aYMT7nsj4zpZfZNLkm9jAp09FFmF03cn9fK1qg76OCvvyhlzw+03G5uVWurIYH4VoZveeFRhcttxj1nDsOAhV+tg/VA8Fd6HUEXbohopi33MTqmin2ADLJk6nUSW4k59zEsAUMMZEj68= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1001MB2158.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(366004)(136003)(346002)(39860400002)(376002)(451199015)(38100700002)(36756003)(86362001)(6486002)(6506007)(6916009)(83380400001)(6666004)(6512007)(186003)(1076003)(478600001)(2616005)(107886003)(316002)(5660300002)(41300700001)(66946007)(4326008)(8676002)(66556008)(44832011)(30864003)(8936002)(66476007)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VDsFQMtJtSt0pnmTEx/ytixR+QDL92PPsLMItaxmyb8o3PR7QM8a5KbFKlAq?= =?us-ascii?Q?RE+No6+CDK+U0rrmWCvb7sa6kxYLtsEwqzOhDrq+tWZYvGsdErMr9gM/UnAy?= =?us-ascii?Q?5J5YaREcNcRSbblvz68VCkYusgH/7691ZJlWH1LrytlfcQpBzrW3BVr3UJr2?= =?us-ascii?Q?CKdfFuRcwOHBEf3BvxLZU3sUuLEo5/fbheOr5PEGvtb0pO4zI6NY7x8Ugxwk?= =?us-ascii?Q?IQBy8mdYL+zzVRB0HJ+JNg12M7vJq9fnfmsJ+PQ7+S/GiUkT4DfwXvFIGeXv?= =?us-ascii?Q?k2r4an19/CWpd6Pvfvj4zgpYQOxHQtYdvhmXWnkHlJU9rbwe0o+mTyS8GiCq?= =?us-ascii?Q?JCgT1hnh/80jfo35+cU5foRCLGE8sdJbvejO9jtcfYrGhUQ43T4yr98iubeC?= =?us-ascii?Q?FSzGBLmjv2ISnSUGpEUl+kMqXeoebQrL9wz0+A0ViXC20VtWWkehunbw1nL5?= =?us-ascii?Q?WjR/Whx01esOy8/y7GS7lYJ19cItCWgvgjlgQFalYnngWPYbN1YXyWglx+qO?= =?us-ascii?Q?Vht11qibLenZ/9Qw/PJA0112nZCSutJE85AFnrFvYCQAICoPYSDrKd1ipPZe?= =?us-ascii?Q?eANCjj1Hga4sqvhFu7mPuWKfpHgs2bAo7Io2CHLhCqXzBrJNHY3lDKRM/U+l?= =?us-ascii?Q?Q/EVqUqV7eOr/PoII9K5G/TXaiZ7GD/XIIVzcyYAIYVNg0R/efBoGQP/nM99?= =?us-ascii?Q?sVJ5AC42/J9Mye6CsWf6D5iq/1V/nWGG1HMwg1GDbiCGsY3jZjMQKqPKaK2n?= =?us-ascii?Q?Mxsxm3Nxz7vNh9moBJWL1JY1Skg6FbHsbx4gJhPXcgwH51iHbzeCXy+EzwaW?= =?us-ascii?Q?7c7rCwjdCmT4+0I00uFRmpbDC8PwxBu9pCXPS+O1v4/ob633AybDwIRCIcMe?= =?us-ascii?Q?qNBaJ1qjoC2fbHFmE6/TOPcHXP45yNIJr4dKG4AnSrI+Mawf4eKmUHt2fDEA?= =?us-ascii?Q?gBsHu/lwgRdekSTuLMg9MVm/gOXo2eqkRx28tgNAezSOPl/cV/9nRSXn42YW?= =?us-ascii?Q?SqX5S+bLd8tTaRlqA8Mn+LJCRrWPLnsvSQIaf4q1vsgBLtTYO9eGJ11YWVxd?= =?us-ascii?Q?uun1vwh+vgtgNHjf+C8ERFuULbm7BGfb0Omb8UFXciXNDOm4B/uKGkNrYnJL?= =?us-ascii?Q?MEG18v/eJMBlbZB+lfsIKV+dCpGiYxozbsgWkIowspvkrdht8r9L+RdPILZU?= =?us-ascii?Q?0fQ4TUUIt+yHibWHeKLOL32MezACi96UG70/QGKBSoFYVqzws34jK+Ocf7Il?= =?us-ascii?Q?G/Vfwscm4MWyTykI/T8WMXdc2mO+atOA+Sl4ZhnrPlZpSfuNe+WKzSjUXT8r?= =?us-ascii?Q?wOTq/Kd1MQE3wf25CSQaLgWPFzcETxIgoq4dEc1gVGHFY4HRxsdbf108lGWm?= =?us-ascii?Q?cp9vTsuKss/XwHeOTsiXlFnyDV2+9FeZOxJ0nZ4wasQyUPbqfedv3A0CDk0d?= =?us-ascii?Q?KGAc5kwm5KmQVH6lzcQ3cRBjSDU3hMKldtyNqfh4SCW/out0q8M+6uB67hZ0?= =?us-ascii?Q?aVzl6sFLcIzy1bAjbdVaa8av+G7loHN+/2fZ4/K5mOQTl2qh90IQre3Sy+qR?= =?us-ascii?Q?WivzwH3Th+JHpr6Qyg/wkwSAz776UP199JPGEJloDQ0/ji8O+hgZq801W4h3?= =?us-ascii?Q?v0CA63591F1Ip4lONaECBPE=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc5370e6-bf07-4e70-3c98-08dadb0e5f10 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2022 00:26:39.8677 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5u1wcRkjjxtFwQAFiPomD5PpDzsg5qSjrgVTnvsHSFv6CtEYSmDUVsvEIbYno5NzvPAkvqWf1u5x+IkJ8peIrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB5916 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-10_09,2022-12-08_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=999 mlxscore=0 adultscore=0 malwarescore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2212110001 X-Proofpoint-GUID: XhLUy_gBPa_JE2o-b5xSz5zXyxWQCysA X-Proofpoint-ORIG-GUID: XhLUy_gBPa_JE2o-b5xSz5zXyxWQCysA X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_LINEPADDING,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This patch is essentially a revert of commit-id: 8818c80cbd4116ef5af171ec47c61167179e225c (libctf: Add ZSTD_LIBS to LIBS so that ac_cv_libctf_bfd_elf can be true) As the specific configure check now uses libtool, this explicit mention of the dependency $ZSTD_LIBS is not needed anymore. As for AC_ZSTD, it was suggested to clean it up (https://sourceware.org/pipermail/binutils/2022-December/125026.html) as it is unused. Althought this patch does remove AC_ZSTD from libctf/configure.ac, I am not completely sure anymore: libctf may have plans to support zstd compressed CTF sections soon/later ? ChangeLog: * libctf/Makefile.in: Regenerated. * libctf/aclocal.m4: Likewise. * libctf/config.h.in: Likewise. * libctf/configure: Likewise. * libctf/configure.ac: Remove ZSTD_LIBS from LIBS. Cleanup AC_ZSTD. --- libctf/Makefile.in | 9 +- libctf/aclocal.m4 | 2 - libctf/config.h.in | 3 - libctf/configure | 269 +------------------------------------------- libctf/configure.ac | 3 +- 5 files changed, 6 insertions(+), 280 deletions(-) diff --git a/libctf/Makefile.in b/libctf/Makefile.in index 036a63fa720..1984f50867a 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in @@ -141,10 +141,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/jobserver.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/override.m4 \ - $(top_srcdir)/../config/pkg.m4 \ $(top_srcdir)/../config/warnings.m4 \ - $(top_srcdir)/../config/zlib.m4 \ - $(top_srcdir)/../config/zstd.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../config/zlib.m4 $(top_srcdir)/../libtool.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ $(top_srcdir)/configure.ac @@ -443,9 +441,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ RANLIB = @RANLIB@ SED = @SED@ @@ -460,8 +455,6 @@ VERSION_FLAGS_NOBFD = @VERSION_FLAGS_NOBFD@ WARN_PEDANTIC = @WARN_PEDANTIC@ WERROR = @WERROR@ XGETTEXT = @XGETTEXT@ -ZSTD_CFLAGS = @ZSTD_CFLAGS@ -ZSTD_LIBS = @ZSTD_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/libctf/aclocal.m4 b/libctf/aclocal.m4 index 96b27970c9f..4607d728564 100644 --- a/libctf/aclocal.m4 +++ b/libctf/aclocal.m4 @@ -1235,10 +1235,8 @@ m4_include([../config/gettext-sister.m4]) m4_include([../config/jobserver.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/override.m4]) -m4_include([../config/pkg.m4]) m4_include([../config/warnings.m4]) m4_include([../config/zlib.m4]) -m4_include([../config/zstd.m4]) m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) diff --git a/libctf/config.h.in b/libctf/config.h.in index ef122aea3f2..5db637c7903 100644 --- a/libctf/config.h.in +++ b/libctf/config.h.in @@ -97,9 +97,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if zstd is enabled. */ -#undef HAVE_ZSTD - /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff --git a/libctf/configure b/libctf/configure index 82c3fb0588d..17463a74cca 100755 --- a/libctf/configure +++ b/libctf/configure @@ -648,11 +648,6 @@ NEED_CTF_QSORT_R_FALSE NEED_CTF_QSORT_R_TRUE ENABLE_LIBCTF_HASH_DEBUGGING_FALSE ENABLE_LIBCTF_HASH_DEBUGGING_TRUE -ZSTD_LIBS -ZSTD_CFLAGS -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH -PKG_CONFIG zlibinc zlibdir ac_libctf_warn_cflags @@ -811,7 +806,6 @@ enable_werror_always enable_maintainer_mode enable_install_libbfd with_system_zlib -with_zstd enable_libctf_hash_debugging ' ac_precious_vars='build_alias @@ -822,12 +816,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -PKG_CONFIG -PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR -ZSTD_CFLAGS -ZSTD_LIBS' +CPP' # Initialize some variables set by options. @@ -1475,8 +1464,6 @@ Optional Packages: both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-system-zlib use installed libz - --with-zstd support zstd compressed debug sections - (default=auto) Some influential environment variables: CC C compiler command @@ -1487,13 +1474,6 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor - PKG_CONFIG path to pkg-config utility - PKG_CONFIG_PATH - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path - ZSTD_CFLAGS C compiler flags for ZSTD, overriding pkg-config - ZSTD_LIBS linker flags for ZSTD, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -11652,7 +11632,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11655 "configure" +#line 11635 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11758,7 +11738,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11761 "configure" +#line 11741 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14298,247 +14278,6 @@ fi - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi - - -# Check whether --with-zstd was given. -if test "${with_zstd+set}" = set; then : - withval=$with_zstd; -else - with_zstd=auto -fi - - -if test "$with_zstd" != no; then : - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzstd >= 1.4.0" >&5 -$as_echo_n "checking for libzstd >= 1.4.0... " >&6; } - -if test -n "$ZSTD_CFLAGS"; then - pkg_cv_ZSTD_CFLAGS="$ZSTD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzstd >= 1.4.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libzstd >= 1.4.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_ZSTD_CFLAGS=`$PKG_CONFIG --cflags "libzstd >= 1.4.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$ZSTD_LIBS"; then - pkg_cv_ZSTD_LIBS="$ZSTD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzstd >= 1.4.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libzstd >= 1.4.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_ZSTD_LIBS=`$PKG_CONFIG --libs "libzstd >= 1.4.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - -if test $pkg_failed = no; then - pkg_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $pkg_cv_ZSTD_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -else - pkg_failed=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$pkg_save_LDFLAGS -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - ZSTD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzstd >= 1.4.0" 2>&1` - else - ZSTD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzstd >= 1.4.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - 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 - -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 - -else - ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS - ZSTD_LIBS=$pkg_cv_ZSTD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - -$as_echo "#define HAVE_ZSTD 1" >>confdefs.h - - -fi - -fi - - # Check whether --enable-libctf-hash-debugging was given. if test "${enable_libctf_hash_debugging+set}" = set; then : enableval=$enable_libctf_hash_debugging; @@ -14578,7 +14317,7 @@ CC="./libtool --quiet --mode=link $OLD_CC" CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS" LDFLAGS="-L../bfd -L../libiberty $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` -LIBS="-lbfd -liberty $ZSTD_LIBS $intl $LIBS" +LIBS="-lbfd -liberty $intl $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF support in BFD" >&5 $as_echo_n "checking for ELF support in BFD... " >&6; } if ${ac_cv_libctf_bfd_elf+:} false; then : diff --git a/libctf/configure.ac b/libctf/configure.ac index 0e0495ba6ef..65686fedc5a 100644 --- a/libctf/configure.ac +++ b/libctf/configure.ac @@ -69,7 +69,6 @@ AC_FUNC_MMAP # Needed for BFD capability checks. AC_SEARCH_LIBS(dlsym, dl) AM_ZLIB -AC_ZSTD GCC_ENABLE([libctf-hash-debugging], [no], [], [Enable expensive debugging of CTF deduplication type hashing]) if test "${enable_libctf_hash_debugging}" = yes; then @@ -89,7 +88,7 @@ CC="./libtool --quiet --mode=link $OLD_CC" CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS" LDFLAGS="-L../bfd -L../libiberty $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` -LIBS="-lbfd -liberty $ZSTD_LIBS $intl $LIBS" +LIBS="-lbfd -liberty $intl $LIBS" AC_CACHE_CHECK([for ELF support in BFD], ac_cv_libctf_bfd_elf, [AC_TRY_LINK([#include #include -- 2.37.2