From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 26 Apr 2021 23:04:43 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lb8PL-00047K-08 for lore@lore.pengutronix.de; Mon, 26 Apr 2021 23:04:43 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lb8PK-00028P-KH; Mon, 26 Apr 2021 23:04:42 +0200 Received: from mail-he1eur04on0629.outbound.protection.outlook.com ([2a01:111:f400:fe0d::629] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lb8Og-000288-Sy; Mon, 26 Apr 2021 23:04:03 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bwaC3+G0aevnbL+XJnVWWvXnFav/XNIHnhKv1fOBrpe06NouMYVKWOYTrWo1jNtF0PR1rK56jHo/uB+amuEWHnObkyUesDPBOVPaNR8ztn3GQPwkosLw2fVuhrAEeoSrKFCVce1BCWru/xdsSoioA7hT9b7I1tgikHDPFrBbqXODNp6XZUTL5StBlBiviSXKkQUxipMo0ZrILlfDPE338uN+z8chgSRHggCJ4ad0FsQVYKZ//PqqbhWxRn8sLof602sGnSBBRzaDxLPozTaY7c9oJgWeqZ+x1MFQz3ISHHPUsPZ/SLUz5wZg8Y2oGhqYq/OWQHlTNi6E1cL2YGGT1g== 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-SenderADCheck; bh=S44HmP/hOrZTOCeKZHP+vS8kwjln3RnqkLT38eOIM00=; b=QOsyuFuHsCTU5kJQMmuQDDkXeRzuBn+hFgnFuzqWPPttytBivqh7t9RKVwnxLACvEUCt7CxglvFEItriq6oPZcGIC1Q191uoLs2OvuYDGF5li3fFRYCzCeAMXBKN8R4wIkippIB05lEo6ypZTQBBuWi3lrDNvYcHj+rE/IdPTbdmh1C1kSNFEg2bsVwt0VHyZ8qQUdFhJdekp2o3KX+JdvnGnM9e/NKB2pcZvUdLE7p4rLscvEq2jUwp5pgc4ieYDQegEXbDLLBB/x+RpMRivwAz0UhH28498UWX8MGW+pATUVfZ/1kdeyPEcqSnumAnCQ4VV/A8yqjsPwF1ZBmGNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=S44HmP/hOrZTOCeKZHP+vS8kwjln3RnqkLT38eOIM00=; b=gfLwzqKA5q3TtX+qSRuyyNuiHpvxQbCwBGRAJ/L4n1IMoKF+ev68Ow4sGZ/uvGNpq8UK9TmcAs+EEFb7b9xHB2r7iQD70xz7hzGker7Bo3/DsbuxqNk8B09kWOAVMPBXG5YfOejMqS/uWh6+X0DTAK+F71kvCEnkEJeBF2bFwgw= Authentication-Results: pengutronix.de; dkim=none (message not signed) header.d=none;pengutronix.de; dmarc=none action=none header.from=t2data.com; Received: from HE1PR0602MB2858.eurprd06.prod.outlook.com (2603:10a6:3:da::10) by HE1PR0602MB2857.eurprd06.prod.outlook.com (2603:10a6:3:dd::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.20; Mon, 26 Apr 2021 21:03:58 +0000 Received: from HE1PR0602MB2858.eurprd06.prod.outlook.com ([fe80::409f:a235:de54:364e]) by HE1PR0602MB2858.eurprd06.prod.outlook.com ([fe80::409f:a235:de54:364e%8]) with mapi id 15.20.4065.027; Mon, 26 Apr 2021 21:03:57 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Mon, 26 Apr 2021 23:03:11 +0200 Message-Id: <20210426210311.18897-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.31.1 X-Originating-IP: [81.234.39.46] X-ClientProxiedBy: OL1P279CA0050.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:14::19) To HE1PR0602MB2858.eurprd06.prod.outlook.com (2603:10a6:3:da::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from voodoomaster.example.org (81.234.39.46) by OL1P279CA0050.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:14::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Mon, 26 Apr 2021 21:03:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77d31e8f-2865-44ca-b9c7-08d908f6cee2 X-MS-TrafficTypeDiagnostic: HE1PR0602MB2857: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2958; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F/yiGV/LuH5kZn7MBCGRWPgb+MaVFYVO6B35pXSa72bTPmdLPGyXZOESMK+2fPx3p7x3pt7lNT61ipPDGDbfHvTt2dk4Y0ugPd0z4XzLZMd/8IYCSh2mMOkM6wYZQf7d5e1LS349RVXaf2v+o4GraLmQScQhVM7PUfocRc2qu+iEKSE1xamh/fLJUtVibVjOUSYbu7p2FJ1Q8lI5NlTinv9UPY4Regcr5x8YhHXFAehDegJVaY/o3DOZFjNzu3jORNR6rkkzGWc9CJy5qZEegJIouAcSblKe8+kYHhOn6xOB2OM/Chkdl95CTsTcEMXrgh0v9HMB9ZjSvb4D1TP2omoRPJW27FrfHD9VqX1qQ2/YPHw3xx0dW79wsJzdtAdcRY4VeNp/VYMYrPOzTnW/ZiEaSN5buo+RLC0yMmefdjwUBQ3Jm+VozMYZgq4fPbV/DW+6W3sjJWQCd7FVzuKKwk1ah3mTsANbacLM3cmTd0LzWQY8MRPBOLgCJsptUNzoYa5/XbKfY+4/iQ3dWT5WKqEJb1Q2HL3lzRyj4Xa469aL3AlKtYYNVJxCZ2UMISDXd+tMwpqo20tEEbLhNprpS4RYMId+wESjq8XTCdpz27i5vlcr0a/GK5lN/RBku1KHPAI0KlcAfp9gl98b8STS65RALyM6dAir2oCyqWVHjiBTuMYJ/zDUh3MGguoY8GUYzioJW3+URq3A0FHNVXMP/Omt9x3A+OwYMJjs7+CWSUY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:HE1PR0602MB2858.eurprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(346002)(956004)(2616005)(1076003)(36756003)(107886003)(6916009)(38100700002)(44832011)(6666004)(86362001)(2906002)(6486002)(6512007)(8676002)(5660300002)(38350700002)(66476007)(66556008)(6506007)(186003)(16526019)(966005)(66946007)(52116002)(316002)(26005)(450100002)(478600001)(4326008)(83380400001)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?Veh9HXzRwcSo5jMkwCcACalze4ezmhztEzn8UpBwDO5fwGkF5lhvfaODxwbN?= =?us-ascii?Q?KrZ3JAqNmfiH+ZJuYHC7Bne+I8M0IW4qzkv2oMx/eiLCbAhBVBTGK3i1QZWc?= =?us-ascii?Q?U8mybOuAOQZ71dNf97fKq0IL9azM7iKRXBRYGPR1wMEWv3yK4X1WaiQCXiAn?= =?us-ascii?Q?JXIGAhxcL1LOmLM66R+2sr6T/f+OOXSuexO5MhbzwqC8GVWbWkgM7BSfjx+t?= =?us-ascii?Q?Ji2A7gyiqbmJj+0N3sekat99qTgVAJivy3SWhTxK+TbrK4vfuzj7B5FT/JkP?= =?us-ascii?Q?0iftu1lCiXkB9fAf5DXyuKRHduyvrkgIDeTmMPy5VIYQpm5vf6aS2/xPERfM?= =?us-ascii?Q?zjeES4JfkK617NCN9uzVSbDDycy2ES/kyoYdmh6delt99PJ7l5HM0O+mhpf5?= =?us-ascii?Q?wLRh1s8JF/t6mhEk86ziaF79lyo+D6rw+TfM6KHVbNGKAHML9WWNDNfbkeUE?= =?us-ascii?Q?U6/9qUEuR1xWyGNQ55IAlpfPc5NIcx+R/5TzweDuQNCtsEcosYonBpxPfCIR?= =?us-ascii?Q?U9rj156KxFazKHJo3zwScuRROnz80RXcDQ0w1PAwprhX+H8Z4yEbJ/vUl8SG?= =?us-ascii?Q?1rRdjnGwEa0yfftUZ4p8dUhE1rSgmdZwGAisJ3S1Uxl71QFYVW69qDDwGDEL?= =?us-ascii?Q?Y0YbOvDSWPVx1F7QvkQkgVCV9RprgAqgo7GU2bt77nAg0ihXohSYv67ZWZi7?= =?us-ascii?Q?dAMPAW9imokKUXbisFqJTPFk5rkT8fPvC7+Oph/C/wf/xCmJYXmqlwLEu3QE?= =?us-ascii?Q?+Kpec4mHLztpiGfOYEbxNl66FKc8kW/0rqV6wcrxZC+/tGBEMo8MFfitYVvx?= =?us-ascii?Q?UwtBYuiFc0ND5+cVIuGqSLp9FP0kGkX2aByfoX0eiCAlsSZvlQ0SiKjK4pPq?= =?us-ascii?Q?CWHppBS1gjmHIFkCp8BhScrVt7Iy0D1IEi/jvvntZLwEH1+EsVHiWODK9Fdi?= =?us-ascii?Q?AACqYEp7QP6cfYltnL8+mwlMDjIFiJWPrupsAdSX1AsSmrI9tIBX3zCLmbRd?= =?us-ascii?Q?/ssh4IDksTC3kOus73dOSHlB8sLNsEPDDfRjP+y7zT1j1ToKkHna9Q3wkXFo?= =?us-ascii?Q?npgXs3geZCpeaYRtmM/C0f1T/oHY+bHk+PKRlg0dOIB9MTKV/hpx0DsJQ+hh?= =?us-ascii?Q?SCW6XjFBE68mJJyrkPmIDvfCRyRlZZ/0jAaH91xfs8SwE8ms1uedP1wsQKow?= =?us-ascii?Q?M5bXU3VdDr2zD4Q7GT3rGQcUkJSfb6hgLcn4LyJJq5IMXIcQciwtaP6owPHS?= =?us-ascii?Q?m+a/qBIYFbCuB5ZGDV7TYCUGb2Jm2DKRSIOfBEmNkKnMSiqzXaYkm5i7NFqs?= =?us-ascii?Q?t/23B+f+CGbk/jdrtQCYR/S9?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77d31e8f-2865-44ca-b9c7-08d908f6cee2 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0602MB2858.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2021 21:03:57.7937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8no/MQXIR4nXB1oH7C63Lq0T6KQQ2S5bM087lfdwAIX1ss2BUniRR33oeBDE04Hrx3DGRoXqVMnBCiW8oQLfBhksSqcWfW+PN2c5sh80ho0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0602MB2857 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] Resolve lib and pkgconfig dirs dynamically. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki , mkl@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Toolchains usually adhere to ABI spec when dealing with ld.so placement. https://sourceware.org/glibc/wiki/ABIList On x86_64: /lib64/ld-linux-x86-64.so.2 This will help in using a non-demultilibbed toolchain in ptxdist. Signed-off-by: Christian Melki --- scripts/lib/ptxd_make_world_install.sh | 2 +- scripts/pkg-config-wrapper | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/ptxd_make_world_install.sh b/scripts/lib/ptxd_make_world_install.sh index e878a3231..91179e3cb 100644 --- a/scripts/lib/ptxd_make_world_install.sh +++ b/scripts/lib/ptxd_make_world_install.sh @@ -238,7 +238,7 @@ ptxd_make_world_install_post() { ptxd_make_world_init && ( if [ -n "${pkg_pkg_dir}" -a -d "${pkg_pkg_dir}" ]; then - find "${pkg_pkg_dir}"{,/usr}/{lib,share}/pkgconfig -name *.pc \ + find "${pkg_pkg_dir}"{,/usr}/{$(ptxd_get_lib_dir),share}/pkgconfig -name *.pc \ -printf "%f\n" 2>/dev/null | sed 's/\.pc$//' elif [ "${pkg_type}" != "target" -a -n "${pkg_build_dir}" -a -d "${pkg_build_dir}" ]; then # workaround for packages that install directly to sysroot diff --git a/scripts/pkg-config-wrapper b/scripts/pkg-config-wrapper index 53be1a987..d86fa7c68 100755 --- a/scripts/pkg-config-wrapper +++ b/scripts/pkg-config-wrapper @@ -17,7 +17,7 @@ else fi declare -a libdir system_path system_incpath -libdir=( "${prefix/%//lib/pkgconfig}" "${prefix/%//share/pkgconfig}" ) +libdir=( $(find ${prefix} -maxdepth 3 -type d -name pkgconfig) ) system_libpath=( "${libdir[@]/%//../../lib}" "${libdir[@]/%//../lib}" "/usr/lib" "/lib" ) system_incpath=( "${libdir[@]/%//../../include}" "${libdir[@]/%//../include}" "/usr/include" "/include" ) -- 2.31.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de