From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id D605D3858D3C for ; Thu, 5 Oct 2023 01:42:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D605D3858D3C 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 (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3951Hcfu026758 for ; Thu, 5 Oct 2023 01:42:27 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-2023-03-30; bh=CI8jOgfrqiibhTgmyRLwuRroAJCmnoojIqZQHTV3gnA=; b=jxSLpTwwYwwFpQJ7VFe3+Bh4Gnh9U8yClW+1Fd2i29ztPTxpDIS2h691hhJNL6mJM0cc hhnm5mTDR87/2Saw5vEvsSWBoRHh7S1ZNcRpVDBjlkQ42Z8XH56xpj/xJd6FI4TOFxYG pV4udLxxjSd+YyjdXoZPamm6aqLz0QSuCOXne4v6y24RsntAh4+26kNDqsoWGDI+57v7 OEZOkdMIvhH9TNKn4yLrQgS1zTSDgdn9cumwhdYIqEBYen8exZN/5iov3Elm5cJ4fKKr ZN3C0kgPpuSyn/UhTcLOJ1tjSR90fsQLVMzfIrYraCrld9Uwe8scChwiRylmRXcog8zK rQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3tea3egdfu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 05 Oct 2023 01:42:27 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 394Mmjcg008859 for ; Thu, 5 Oct 2023 01:42:26 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2105.outbound.protection.outlook.com [104.47.70.105]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3tea48wk3b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 05 Oct 2023 01:42:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V9o980AJfqVEfKVAGTUZTWMBP03vRIWAMl3ZBa3OZPumRWg97LUBR4kD0BVLaEQFDS30paa+PVMP7i/Q5hqfmKkTnWB4iYTa5l1nkg5N19n0F2/HbwVmKOe+tAa4nUTZ+kwRHEMtsX1QhoU80sG8Q3Zx34WXbH7z+SyIN/VsusBs50UEhhR/WsvepXEPKfw0u9dxnT8oK1/A0MWDxfTTFofmtOTAtXplBvFIi/hhKru0x67nUbcMDDrJNLfJWU7H4g1rJoezftUtnquABbd1Y3CZ/CoARU8qdLrysUWUNsCfo8kYsd1MeVsKaoB5sEA/1H0Mnd7APNyeBkvumi/ghQ== 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=CI8jOgfrqiibhTgmyRLwuRroAJCmnoojIqZQHTV3gnA=; b=SJ6RJIczMxMA0U+pzOWdygSZqEXvHLmiJXiBnyE2fqPvu1rlXwYOXk+yyC8XLzZOjDsSDO/hASo2An2dM8eWKeYTlcBq3HbNf7/rtprzTgqi7i8mGreTmeL18hOh75wI/7Xl/fKo8mnO91BU3lr3Hwczl7udkk+NP3aAMQAWcEdkQyKujjxjA4sD5QOQvuSIqWoujmYNSmjuJ9PJwna4IZ+i3ADEMhcw8GCypCNtPCzQnGp/qnuxpGnFo77QlEX5QW5rlPIuMMbUufhd4XT7iyePeCuNY6Zaptcixga5AQHCh0970Kr8t5PWW7WVopKQ6I0YJG519fYyqkwIbE9Ohg== 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=CI8jOgfrqiibhTgmyRLwuRroAJCmnoojIqZQHTV3gnA=; b=Rcz5ny0P0JrXjuWoRlma5KZiUzrE4d652BzWJaN57v4KTk7kr+sAmZg+TWS1ogKJgC/8r7mzCI6Wj9mafmhsGv2/cnZV0kcHwBuXEXLnUG0vaC7v+usoruO/3CWPIPNpOyvGRVNxFO2tLWWrk1ApM2XKNOHpa5HdyJXRqAi2UMM= Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by IA0PR10MB7622.namprd10.prod.outlook.com (2603:10b6:208:483::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.27; Thu, 5 Oct 2023 01:42:23 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::10b3:cd52:5c1e:146e]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::10b3:cd52:5c1e:146e%7]) with mapi id 15.20.6813.017; Thu, 5 Oct 2023 01:42:23 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Cc: Vladimir Mezentsev Subject: [PATCH] gprofng: 30894 bison should be no hard dependency Date: Wed, 4 Oct 2023 18:42:14 -0700 Message-Id: <20231005014214.1457876-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.31.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO4P265CA0168.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:312::11) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PR10MB4636:EE_|IA0PR10MB7622:EE_ X-MS-Office365-Filtering-Correlation-Id: a98847f4-261b-48e7-a5cc-08dbc5445262 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oKJZMZ7Gv2h1QVMor7085qQopXWVY4Sb5YHzuePQqwZlqLiavXaWTZYDsr1AnjfbBEZJMV+sVbNBCbldlPZS59agjXjMN46Wrv9+TaMuF6umhkBkhv7O5pPIWZL9TmFJ6ltFJm5meHxrodsJhmatc4JHR7AckO2NQbvWf2DXeFAV1REBjN5Y0bi89HJrRq+GfRPoiImdT/UEmgSNwG/cuaCSmqgnniu6u0gPd6+OwuthSds8NYi4838KWDOUJSKG9np5V7Y++0x7Gva+Ac+u5XzjibT6CbEg75SzV/3i8Fb3E3Qy1EBvpNYruwGorS1q9E/PhjBiDW/sH9sZ0OPKKvFtw2HZwnyKU0vdDdYhD2k+xgS7ZvukNC539/0H/8bTv+uhFRCeQCJd+1YGfvjEHUY/ImZ3xT2B+cOtKeD80p+/n301nJE8XGhfHfCStNWvG6QF9uGUL60n0ublwRO9AtPemVSscQQPyWknIQyd0PQx1mYEC3FxxzVYZ8iu8sNSXsCks8APp8DFry+gfb6T9vqj0Y6KKAmpKAPdCn1kvI+NZeyDEvSV0X3eWh7ikya+ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SA2PR10MB4636.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(396003)(376002)(136003)(346002)(366004)(230922051799003)(451199024)(64100799003)(186009)(1800799009)(2616005)(9686003)(6506007)(6512007)(107886003)(478600001)(6486002)(6666004)(1076003)(83380400001)(2906002)(5660300002)(6916009)(66476007)(66556008)(66946007)(4326008)(8676002)(8936002)(316002)(41300700001)(36756003)(38100700002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UYGBLpdcBPvueEWpnh8AA2rN5sWqxbduLg3d1tPkE7uFtoAoMmKDsaF1ijh5?= =?us-ascii?Q?Ecm62CTQzmn9dsxIMZ8S1TgoihZggaYYp2WfqFXccyP9j2Iuso/Aoq3/2p3F?= =?us-ascii?Q?aJnxtrZaKLFwS8QkQh+EGfM6+Uh4I3hirEaKJxZf0KQ4ySubEIYKy7Qb5a7U?= =?us-ascii?Q?DuYpOz979mIa9jsif3lPITIpmm9ITKjI44EnuZvlWmK8/T98lZIKhDfphUMg?= =?us-ascii?Q?hJsufX/s6Pe9QOL8eQ8GDT99RHvlMqH7i+SJ9M14gqO0bGBNSaW/Kg/ruLcs?= =?us-ascii?Q?PN6w2yoPd0bfbtEpbVJxHvqiE5vV29zptAb4MRcmQxup+hTkVEv4wBvtruFD?= =?us-ascii?Q?bXamOcyx4RWK6BwoI3AEAgLCcnCjiSaqJOconnuEgPdWcF+83N7b9ymG5ZnG?= =?us-ascii?Q?4XDLsyah3TXa4YXSSTGwGVUyAPlNAAeuKQYxQbXWPMVIDi098baxa2sZ1rmW?= =?us-ascii?Q?yEcUgPtd/8KToEN8eL/DSAGBlv0pg5EWXenfD6e5i4o7azSFStKeeF1YlK4G?= =?us-ascii?Q?nabqEFaV/NqcwRPRfHj/+8Mqb4r98RQmOtJqtoWeN03DaU1EJXYkzv0dm3Vb?= =?us-ascii?Q?BKyS+j6jv0PkkD4pk1Uki117jTNv++XKnvBYnhWRr8RqpSxERCvYMbYxUhH0?= =?us-ascii?Q?rza36P6nLVfthhL3aRx8uEPa3/bFVR/7hYprMV4zPzRwNzY3qJq1CnkhML4o?= =?us-ascii?Q?6iTWruwQjWYD+xdO+6WIYrxP9+fmgZxrz5GhJXTeETMVkTdyugOoltfF69M+?= =?us-ascii?Q?WKYh7zg9L66ao7qhK7iZYYv+lU7iN2ZOpvi3JLXR4D/P5Mm5jcZM1rVxwYMl?= =?us-ascii?Q?aLDliDLh4JCdkhte77nYSFHf9oWjTx0MJp441ATp3YwdVHMSZhzJAGtGmvu2?= =?us-ascii?Q?/3HIHwMefwAyDvCMgGO7YeHYgV6yTbDjqsKE3rQRLkhiV/95ZX+Ctx7EHoLQ?= =?us-ascii?Q?Pce332ul9F7k13mVHcmGNTHNcX14c3U1UxQr9F6PpPFbJpT5w2CN2Z1BnETj?= =?us-ascii?Q?ueIlQBVkcmumaEnls3L6RWzdOTDZ+TAbIgiUXdiahC12UYUQJIrpnQbMgdRJ?= =?us-ascii?Q?KUPN8LKnG6JFf2/GCZtBlGBGvIh96LGu8W97MlxpB8jSDbFV00D9dXFCUFet?= =?us-ascii?Q?/R0q74QkDd8iACXw5Fqo3IDAsgNMRZXGKjSuXDGcn84arujC/QJp2mRv9TTw?= =?us-ascii?Q?Nn1Htk1zMboAnpOE/3jYnwQl1SNO7A6faGr6y9GAE0tT19oWqgMw/tAyq4pY?= =?us-ascii?Q?CwI8x0R+6DnGiWXgbg/MXLnK6gsH1/biUCT4hFad+fPHT9uKYD8pE97wVlsb?= =?us-ascii?Q?b8ruhk3C9fqy3m4jikP7gEAAsDgFEobDDkDdOvzIyqoDKQFzoi+hIVre+aU+?= =?us-ascii?Q?sbvo5nuivpwGQz7Bu7pKdAgXwSsEcr/9cdNJxOycl8BLZC2MGkpkg4Tb6HC4?= =?us-ascii?Q?yKaZ0tSxdGORCke7s43Qh0//75xUb7IbiVQE2ba1GFdgV3SOs0vRJY6naGAk?= =?us-ascii?Q?dKK5ZCN6JklDqjNwdDVRQFNHoVlMI223YOAP31ozpr+ddphADPiiLvuRckFa?= =?us-ascii?Q?Vq/kGmDXpm3Oefv/IVuQd81GWCTMk3HmwYAWKnrKJhtLmI8tQ0UJG0uovO9x?= =?us-ascii?Q?0zdpsv6a5GzbV07XuYevryc=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 1hN/Ly8jPE2bqY9gzHvfP64+3Zfu0pXKiCToHqeevADAXbQWnuRZwlCcYH27XPHFeI1WbMOfDjD/OKlxSvE3ik/R1PCmf+I97wcRp3Dy/i3luziJvJt9jJmGhxXf4DoPiM83Gyvl3dR4Q9VsHpyn6QYWX9Yvoia2CXNXFm6HqeMjoVVDWmofOdnVsIGzFDYtWG0QvsyB6ViyCkw92WXTendddin0mjLNqgWkBtoplLaN76fmY5hM0E4hIfEIVYTVWrAwI47H1nuJBfH6eyjKMxppwaB2rMklu3hjxcBlUCrVx7DgWiPAvOM43eUqTfkem7tAA+I4MIO9RYMOmuBiH6foT66RgL2po1IaW4UZcrxhYN97+1ZVzytAAuuLE3nPeMfVFrl9o779y6x2DYDNPiHFAwyEa7RfpjbT3/ZhcdM4foN+1pVG9iY5SHDxkQaHvT2FCDYi54neAgfqzTPZYVGlnbyp8QfvkrmH1HOPK36H4FRoz/MsyVRvV8zDx1PFj9RvWQCXmbfR0cQCeI4n1IrRhP7bwze4FRiO2n3nL3aStm+hPdJbxUrzV3hbGzDKpqry3mZ9imHunSpRflLOjNKmpCaKI+ZVRjo40E+DMIV2jOnyuAehSVads0KneS7OmJU1CHXlSPawl+8Y454JMer4TSONBS6MKlwPCqmGuk1EyIwD3behIK11wYga86RILEVPGgL8Ar85jascuNQ8C3P1Ewp6eO12fJH84gBkLiZiiltSkWcYGzWSH6fyL8Ih X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a98847f4-261b-48e7-a5cc-08dbc5445262 X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2023 01:42:23.6161 (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: 6gAhuglkU6I2/iFHFgsash6h7apNA/0veMt9Cwt54rsFMQrqilCpDpsityHQLkOPWb5ACIYx27/5fycZk5d8/j9/+lIxboIU5Epn9cP6QL8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7622 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-04_13,2023-10-02_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 spamscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310050013 X-Proofpoint-ORIG-GUID: 1PDKFa1ofrIVUlDvLk6mh0as9isUK7ov X-Proofpoint-GUID: 1PDKFa1ofrIVUlDvLk6mh0as9isUK7ov X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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: From: Vladimir Mezentsev When running from a distribution tarball, bison should not be necessary. The generated files (QLParser.tab.cc, QLParser.tab.hh) should be distributed. configure.ac should not abort if bison is missing. configure.ac should remove temporary files (dummy.c, Simple.class). bison must be run once to create QLParser.tab.cc and QLParser.tab.hh. gprofng/ChangeLog 2023-10-03 Vladimir Mezentsev PR gprofng/30894 * configure.ac: Don't abort if bison is missing. Remove temporary files. * src/Makefile.am: Distribute QLParser.tab.cc and QLParser.tab.hh. * Run bison once to create QLParser.tab.cc and QLParser.tab.hh. * configure: Rebuild. * src/Makefile.in: Rebuild. --- gprofng/configure | 15 ++++++--------- gprofng/configure.ac | 11 ++++------- gprofng/src/Makefile.am | 19 ++++++++++++++++--- gprofng/src/Makefile.in | 22 +++++++++++++++++----- 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/gprofng/configure b/gprofng/configure index 005f9cbaf7d..90f869829f6 100755 --- a/gprofng/configure +++ b/gprofng/configure @@ -6113,9 +6113,6 @@ $as_echo "$ac_prog_version" >&6; } fi -if test x$BISON = "x:"; then - as_fn_error $? "Building gprofng requires bison 3.0.4 or later." "$LINENO" 5 -fi # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then : @@ -12252,7 +12249,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12255 "configure" +#line 12252 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12358,7 +12355,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12361 "configure" +#line 12358 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16609,14 +16606,14 @@ else $as_echo "#define GPROFNG_JAVA_PROFILING 1" >>confdefs.h if test "x$JAVAC" != x; then - cat > configtest.java << EOF + cat > Simple.java << EOF class Simple{ public static void main(String args){ System.out.println("Hello Java"); } } EOF - if { ac_try='$JAVAC configtest.java >&5 2>&5' + if { ac_try='$JAVAC Simple.java >&5 2>&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16626,7 +16623,7 @@ EOF else GPROFNG_BROKEN_JAVAC=yes fi - rm -f configtest.* + rm -f Simple.* fi fi @@ -16677,7 +16674,7 @@ if test "$LIBC" = musl; then $as_echo "#define __MUSL_LIBC 1" >>confdefs.h fi - +rm -f dummy.c # Check if linker supports --as-needed and --no-as-needed options. { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5 diff --git a/gprofng/configure.ac b/gprofng/configure.ac index cfca82e3651..7938d7b2cb0 100644 --- a/gprofng/configure.ac +++ b/gprofng/configure.ac @@ -30,9 +30,6 @@ AC_PROG_INSTALL AC_PROG_RANLIB AM_PROG_AR gl_PROG_BISON([BISON],[3.0.4]) -if test x$BISON = "x:"; then - AC_MSG_ERROR([Building gprofng requires bison 3.0.4 or later.]) -fi AC_DISABLE_SHARED LT_INIT @@ -130,19 +127,19 @@ if test "x$enable_gprofng_jp" = x; then else AC_DEFINE(GPROFNG_JAVA_PROFILING, 1, [Enable java profiling]) if test "x$JAVAC" != x; then - cat > configtest.java << EOF + cat > Simple.java << EOF class Simple{ public static void main(String args[]){ System.out.println("Hello Java"); } } EOF - if AC_TRY_COMMAND($JAVAC configtest.java >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD); then + if AC_TRY_COMMAND($JAVAC Simple.java >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD); then GPROFNG_BROKEN_JAVAC=no else GPROFNG_BROKEN_JAVAC=yes fi - rm -f configtest.* + rm -f Simple.* fi fi AC_SUBST(GPROFNG_BROKEN_JAVAC) @@ -177,7 +174,7 @@ eval "$cc_set_libc" if test "$LIBC" = musl; then AC_DEFINE(__MUSL_LIBC, 1, [Build with musl-libc.]) fi - +rm -f dummy.c # Check if linker supports --as-needed and --no-as-needed options. AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am index 219367fb9ce..adc3c581df3 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -117,12 +117,25 @@ AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_CFLAGS) \ $(GPROFNG_NO_SWITCH_CFLAGS) AM_CXXFLAGS = $(AM_CFLAGS) -QLParser.tab.cc QLParser.tab.hh: QLParser.yy +# bison generates two files QLParser.tab.cc, QLParser.tab.hh. +# we don't know which file will be newer. +# Make QLParser.tab.cc always newer than QLParser.tab.hh. +QLParser.tab.hh: QLParser.yy + if test "$(BISON)" == ":"; then \ + echo "fatal: Building gprofng requires bison 3.0.4 or later."; \ + exit 1; \ + fi; \ $(BISON) $^ -BUILT_SOURCES = QLParser.tab.hh -EXTRA_DIST = QLParser.yy +QLParser.tab.cc: QLParser.tab.hh + touch $@ +BUILT_SOURCES = QLParser.tab.cc QLParser.tab.hh +EXTRA_DIST = QLParser.tab.cc QLParser.tab.hh QLParser.yy + +# info and diststuff are needed for src-release.sh: +info: $(BUILT_SOURCES) +diststuff: info lib_LTLIBRARIES = $(LIBGPROFNG) libgprofng_la_SOURCES = $(CCSOURCES) $(CSOURCES) diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in index b881268b0d9..76a0c950079 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -543,8 +543,8 @@ AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_CFLAGS) \ $(GPROFNG_NO_SWITCH_CFLAGS) AM_CXXFLAGS = $(AM_CFLAGS) -BUILT_SOURCES = QLParser.tab.hh -EXTRA_DIST = QLParser.yy +BUILT_SOURCES = QLParser.tab.cc QLParser.tab.hh +EXTRA_DIST = QLParser.tab.cc QLParser.tab.hh QLParser.yy lib_LTLIBRARIES = $(LIBGPROFNG) libgprofng_la_SOURCES = $(CCSOURCES) $(CSOURCES) libgprofng_la_LDFLAGS = -version-info 0:0:0 @@ -1021,8 +1021,6 @@ html: html-am html-am: -info: info-am - info-am: install-data-am: install-dbeDATA @@ -1096,9 +1094,23 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dbeDATA \ .PRECIOUS: Makefile -QLParser.tab.cc QLParser.tab.hh: QLParser.yy +# bison generates two files QLParser.tab.cc, QLParser.tab.hh. +# we don't know which file will be newer. +# Make QLParser.tab.cc always newer than QLParser.tab.hh. +QLParser.tab.hh: QLParser.yy + if test "$(BISON)" == ":"; then \ + echo "fatal: Building gprofng requires bison 3.0.4 or later."; \ + exit 1; \ + fi; \ $(BISON) $^ +QLParser.tab.cc: QLParser.tab.hh + touch $@ + +# info and diststuff are needed for src-release.sh: +info: $(BUILT_SOURCES) +diststuff: info + # Distribution involves building the binaries to generate the manpage, # so ensure that the necessary libraries are built at dist time. dist-hook: $(LIBGPROFNG) -- 2.31.1