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 CA8B23856954 for ; Mon, 10 Oct 2022 23:04:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CA8B23856954 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.5/8.17.1.5) with ESMTP id 29ALwkfY031132 for ; Mon, 10 Oct 2022 23:04:33 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=znzHw3DfSs66Bl9g2cFgJy5UA6aN1r1z8uiFyb1PJw8=; b=NpFLRmZ4nBk+KQsexbe0Q3knc3Ik0hay6BV+UJDxZ4q2+jRKxunVohJmOui7yN8Qsunq 3rO6Yc8WSWkj6q1iqesTVfNtgHknzocYliX5SbmzqBqlOyeMxtzjCm89WLCZg+ryk9u0 4MPup+nOkiQc1CdSzFL7BbTvZCxSn6031/RKrF3BxGs4ySfpB6PiMRq16C+0dN628w8r Ia56ZMhfD+yzkW3QhLekyJbUXjhbI0au+JbNuaVCDA4hPi88R+x/gg1EMSv2eEmF91WC xv0FBkUwjeAwjQE6RvqPREUPJZSRtP9uh7FkSqRyRzhhO8qBCtUwyZqLsAsnTYmJvCn/ XQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3k2ymcvy35-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 10 Oct 2022 23:04:33 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 29ALOfFC028931 for ; Mon, 10 Oct 2022 23:04:32 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2176.outbound.protection.outlook.com [104.47.57.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3k2yn9v7hf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 10 Oct 2022 23:04:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bnX7V/E+tD9t+Am/bBVAr0+xVp0jLBx0VJEa2F2OYfr/N7GMKjFDwxx5kTQFkCAYZPliQ+vFqoNYevGFx6kCmaAKxSuTaWJGUUaq6fp7KimefTKxGNuFpK7xn5doT7tftdvehePvPBnfDLXtEI+AIdLREddP+8FswGU2843xntPIneMuxRsfetel8AMpl/XVLrsI0GRtx16EqGEJIpTkqgW/i6ac08PEwmD/VJjNcAI6dlmOtHrv7U6YBsFzQjKB1YDdmti3LGU1nY/gJJtt99u+FRTPlYdAinGXf8n7rCDBpc87PfE1EY0Q1eY6s0nSpXZQ9VI0mtyqankfzoJ76Q== 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=znzHw3DfSs66Bl9g2cFgJy5UA6aN1r1z8uiFyb1PJw8=; b=b6DFlsUaUoPp6y33CRn+sh4OkBaiqAJDmROsDJvaM8ewhXrSdf60CYgmXmieBu+1MDRNhkEtwqGA5F6jeHwW0p234gWORpqOzmEmvTjgiZnpDQFlKJ2Ah+zWNHDehM464FsGJitkL3BEWv6lYl3G/vtIkJ0jYFfn3OEGh263mG/2PkhTlpjNhkLUk0F2qAModeii/F23vLAIPMZYUSOO/xZSrtNRF486OIzVjUa9cv7OA5L6HM1kvRhVtixZY3yh8r0ogG38RYMptS9C2pH46zqZ6gqhD0Iq9TbeAIZzKQRX3CS/bhkvrh4oFkY0UpjxeIKyvMjjCDVQ2lmyMXFkIA== 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=znzHw3DfSs66Bl9g2cFgJy5UA6aN1r1z8uiFyb1PJw8=; b=jIeLnnPUQwOksNMey6Pt95LBkVk3IX9cHMiVH9KNjlevqFf1cPxaZTw3ApBKv/UulUofI/2mw42LXRVlzso3c1WreGgP8yiI0Q1gx1GQY5X7tEc2a/TYqZTFLyIh4mLuF1yrLxbuiFWGriXN6kyaRGwqCLGoK26ULizK26TnBRo= Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by BLAPR10MB5154.namprd10.prod.outlook.com (2603:10b6:208:328::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Mon, 10 Oct 2022 23:04:30 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::989:999c:4e86:6f69]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::989:999c:4e86:6f69%6]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 23:04:30 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Cc: Vladimir Mezentsev Subject: [PATCH 2/2] gprofng: use the --libdir path to find libraries Date: Mon, 10 Oct 2022 16:04:26 -0700 Message-Id: <20221010230426.719238-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.31.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SA0PR11CA0153.namprd11.prod.outlook.com (2603:10b6:806:1bb::8) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PR10MB4636:EE_|BLAPR10MB5154:EE_ X-MS-Office365-Filtering-Correlation-Id: 0cea708b-23f7-42a9-9491-08daab13c9bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hiVlG4Ok0Lj0NsVdjbdyZN5Vt/I8uspB+wBWnhl1GoHSzQ3nFPLdle2BT42NTpkFszspwAr8MQtgj/mhBDpNVwHseFBh+v+nzo7+TDimq4RUmXJniwtXUMCn14gHQc05cB9OX3+eYiv/ead3e/zdat35A93cV968s+wPp2lDqZN6A7QhOYBMcf7O9yPmxe2kQ45N/4K3TImVtxh2SccbQrFb+5AaNLphQDR9qla1F7G1LBc1avCSHwbT80Rx5YsVtNWGYYYCVsKrO4DTNXD9cNBuYUz4oWmm7VHeg1InXjwUIQyO3m8PLAcJkUEMlaXprjubuCnFCzIM84lvc6hproZy3Chm40mc3Tp4LW42z3FTIlFkT0QO8/uQJl0uLTu4pGTetdYCyKzw1DxKwqu2V2k+GMg2boze0kqq3sstiJBcxveUZ9B9ibYe6HuupoBXejISj0MivD+J7CcR9Iq1c82sJIF2k9whA3/M7aiFL40SpK/bjFOaygq4JW4A101xD1BQMz2rJwNzpMD8jZLdpsStQJ7Ycvf6QZKLZ9Ir5+/wD4EM4tKvdCM8HEEXfXJnUXgv0sMSLxm9iDfBhagHRxiWd9QNJfk5oNmuxp9Iv2IfF0bI5MEkZTyL6/LLuk/XofaeX8qSsVllwBz8bYOktea1AUfYfytEYUUzeBxhTqiLLRNDIfaQl7hkgjxCDwYpTZbYNy9flaVBA7xZ3ljZeCftce5+fm9GBd0iTfQ+SJ4irzH3ETj9BqYbsttTsVl+ 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:(13230022)(136003)(346002)(376002)(39860400002)(396003)(366004)(451199015)(83380400001)(2616005)(86362001)(6512007)(41300700001)(36756003)(38100700002)(8936002)(66476007)(9686003)(6666004)(5660300002)(8676002)(66556008)(66946007)(6506007)(2906002)(4326008)(6916009)(4001150100001)(316002)(1076003)(107886003)(478600001)(26005)(186003)(6486002)(37363002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wlYjZwewH0n+VdUDY+vAWK5cqxFeNvN8RQ0hTBtRMfkutatn/ry9cm/bWyCT?= =?us-ascii?Q?gqOZ7OGcXMZZcs+9//2ZsHaRKoF9J5jNuCf1Q8I4lE7bbi3ZURA37WetyXgL?= =?us-ascii?Q?SmnFzx42Vjr4V+HUzSLQTQG/zzqlT36wmcmdio/Dm8oRAdZOc31VtDp/viBt?= =?us-ascii?Q?VH4izPyxBr28/eC7CsNmvLnlKNjCyfohJDvPwxd/rVt4OKbCai/uNRKRqjVO?= =?us-ascii?Q?WKpKMdGDFenbg2UmcIZ2A6y0Cz2kzASq1F5+MI+SwmHSew5jkf6r+JSyM+rc?= =?us-ascii?Q?A/keVaobGc6QZWMZ8VA7bFD8aq5tJJmkMpG0TcDzHZYAzIkbElviFCJbsJmZ?= =?us-ascii?Q?R43PHejNw5+hATy5lNxst0NTYv+NWPuWLqKW3wdGxlyAdi2p1sGNg+jzyagS?= =?us-ascii?Q?SQFzyYGdoJGY0VB3hAHZt4zRT4r9Wlo1vEhmUf1RQS3s32zC5m+hfflpuY2P?= =?us-ascii?Q?c9PO09ad/mgA0K3QTtZLwfSX0DnufrHQ8OOOaPi7c+KtIzqlvcSyxcPsd/s6?= =?us-ascii?Q?wWRPIpt02ZojEagzKi5idAAYFYHwcscKhVFDaowuEEKPCKuD2Vp6GxSaUNIo?= =?us-ascii?Q?YSnzr00tewqtdam9xS8iBX8Wikzx4EY8xKo0Od48dM6ViHW76TYWSytlFkVo?= =?us-ascii?Q?RNS3oo4Qp31628sZ0EQT3W8D/CL1xIgc2le//E1ib31TY4lqf0te6euPk3Rw?= =?us-ascii?Q?alfzf+uX3ixBfytiY0Q5Mv1wIzYhytG36BJVjv+nNf1Ahg6nw/jM+siQjuxs?= =?us-ascii?Q?fo/MNvpYNnksbKeus87IPIbjBXfgHdcYjdC4Tuujo0zj7as9ll9glMr1nRqD?= =?us-ascii?Q?CTYtdgrHdg0hvbbsCZSTQettpScDHq0iMmyH+Z7mTm/NL9t+KCrZBhCHx36o?= =?us-ascii?Q?fUst0qoJ4l/o7oSr3coogruewaK1D3pzRYrambahLloJoc52f9W3Iw78ntOG?= =?us-ascii?Q?CryhR9Wkhv8svYGT2m73UQ96zR9thWUpB0fKiktSA8POg4KV0vlOsLAhSf0X?= =?us-ascii?Q?PJjnIKVjW5L5YukM38/07dKnmJyF0viKBHIl73TNcwrFnGYNXpGd9dkDbHCs?= =?us-ascii?Q?KHGl6qOxjN1qUy68gCEDq3x8Ia5yOHIn+ps00jLe7iWQPAHpLepPcokf6zG3?= =?us-ascii?Q?/fRHvTc16rJsy0CQI8y5Z65ZbKPppsQ5Kp80yHmn1m7wh2+y9+00Gi1Tiori?= =?us-ascii?Q?BMiDN+AEb8xyR+4vuhvWFsP50h7p5Jby6D526raRMnglostDV/mgfSaV8eRs?= =?us-ascii?Q?RUNyR3IGesU4qzoigo+GU6yOpJA5OkoFXCiBejXcFaHEoC6iBtfqm+4/UUTL?= =?us-ascii?Q?iaaM8JrCjFO1SzDCUw/Pf+w1BMuofZfyfXUc2n2nsSYTw6KXiubiKZ7+SXcJ?= =?us-ascii?Q?rQF24URIYrVktNk6qbsmAjdSUtpkiJh1TNhGL0Vbmxb5ra21pQfaNDjP3AH5?= =?us-ascii?Q?0AK8JpCjHDRdIs83XU/ZdzUlJRO7zUt5jAG9YrENSn+b7FSl1FjBjwiewn0H?= =?us-ascii?Q?9vT7R0yT/gTY0RT9ZILMXdd3tJho0EOPz/G3rxOVr6qpgSjmc9SQEV3sVwmd?= =?us-ascii?Q?6sLvLsp8K4Nc+mrae5oV/HiYQgsebJ+kQ0dZ/upDCAl6Cvt1FaZRBzsfTR5k?= =?us-ascii?Q?xg=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0cea708b-23f7-42a9-9491-08daab13c9bf X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 23:04:30.6662 (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: 3g7xiWgxLdIfmI6N3ici6pwU5FLKtZaPzFotLRVvM/xdzhogiRt7RioUxNI4gDKURE4Qf1OnbybMxtjowbUUdY4t39judHxj5/9O8bMuPCc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5154 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-10-10_12,2022-10-10_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 malwarescore=0 suspectscore=0 mlxscore=0 adultscore=0 phishscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210100137 X-Proofpoint-GUID: 2DVBD89wd5i8J1To3Otgza8_ziOxBELo X-Proofpoint-ORIG-GUID: 2DVBD89wd5i8J1To3Otgza8_ziOxBELo 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,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: From: Vladimir Mezentsev gprofng/ChangeLog 2022-10-10 Vladimir Mezentsev PR gprofng/29663 * src/Makefile.am: Add -DLIBDIR to CPPFLAGS. * src/Makefile.in: Rebuild. * src/envsets.cc (putenv_libcollector_ld_misc): Use LIBDIR to find the gprofng libraries. --- gprofng/src/Makefile.am | 2 +- gprofng/src/Makefile.in | 2 +- gprofng/src/envsets.cc | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am index 6e0931524e4..27ef7974afe 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -108,7 +108,7 @@ LOCALEDIR = @localedir@ SYSCONFDIR = @sysconfdir@ AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" \ - -DSYSCONFDIR=\"$(SYSCONFDIR)\" \ + -DSYSCONFDIR=\"$(SYSCONFDIR)\" -DLIBDIR=\"$(libdir)\" \ -I.. -I$(srcdir) \ -I$(srcdir)/../common \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in index ba7fdd6e8ad..7efdb9885f6 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -536,7 +536,7 @@ ZLIBINC = @zlibinc@ LOCALEDIR = @localedir@ SYSCONFDIR = @sysconfdir@ AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" \ - -DSYSCONFDIR=\"$(SYSCONFDIR)\" \ + -DSYSCONFDIR=\"$(SYSCONFDIR)\" -DLIBDIR=\"$(libdir)\" \ -I.. -I$(srcdir) \ -I$(srcdir)/../common \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ diff --git a/gprofng/src/envsets.cc b/gprofng/src/envsets.cc index 484cbf83995..c9838416638 100644 --- a/gprofng/src/envsets.cc +++ b/gprofng/src/envsets.cc @@ -159,12 +159,18 @@ collect::putenv_libcollector_ld_misc () sb.appendf ("%s=", "SP_COLLECTOR_LIBRARY_PATH"); int len = sb.length (); int cnt = 0; + char *fname = dbe_sprintf ("%s/%s/%s", LIBDIR, PACKAGE, LIBGP_COLLECTOR); + if (access (fname, R_OK | F_OK) == 0) + { + ++cnt; + sb.appendf ("%s/%s", LIBDIR, PACKAGE); + } + free (fname); for (char *s = ev; s;) { char *s1 = strchr (s, ':'); if (s1) *(s1++) = 0; - char *fname; if (*s == '/') { fname = dbe_sprintf ("%s/%s/%s", s, PACKAGE, LIBGP_COLLECTOR); -- 2.31.1