From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 08 Sep 2021 16:01:53 +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 1mNy9B-0007WZ-T7 for lore@lore.pengutronix.de; Wed, 08 Sep 2021 16:01:53 +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 1mNy9B-0004o0-2A; Wed, 08 Sep 2021 16:01:53 +0200 Received: from mail-eopbgr130042.outbound.protection.outlook.com ([40.107.13.42] helo=EUR01-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 1mNy7h-0003ck-AN for ptxdist@pengutronix.de; Wed, 08 Sep 2021 16:00:21 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oIFaSQc4ubPu4gOKApQC8+nciTgN3/8QsDCR1ZYmrgktFwl0SupusJcjdofnDgKbQ3gUoQx3FMw3+Sp1EhuhYiad7oa4OHFvxDZkkDH9KY0FJB3t3xTkmQE5X7iFWr3uHnwr3J1R26JsaX8EVwK2JlacN3YkG1XuC+ceyacjaiveLMv/Vujjkxa/OV7eweTVzJENBn+JnewKJzOaUlAQntIlVcHhSxrr06BnlSdcAL0xuv+BUIpH+MkqK4c7rAORO/1PGZRMoDSSm/l7NX/rkzUYxUihZSuTRiNL+BKkDqND0e8otMA31Bl7IfyFDXxHXPgXYu5GsgV3qDgIyhKtRw== 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; bh=O527jGVuw2EWFjBbviEwIcNIxlmvQzNRhWu+YJnI4yo=; b=Esnbq7qrJl+sV4o79Hi5YnXXOyEtn0wsLSaeLSnoSHBG+ZEF4dFEzWxrjYrvOG50XhQ/ptFq4+pT+Tk9qqV5gBINaBlPHxyR/tE6Awsyxz4lgzuI8oUXNXaRyQS64xaeGpdghCg/WS9/NsbI+ka75PGQ//Q5uCooIgpKdZ7RI+j9eVrOQBJAu2E8S/89wDtzs/2KUWkFp15Z19wPqITkwI383WFalnwE53QlxQu+jnq/3qUQgukMVN7NU6yuYQQ869y2TWQ4k+wmm+GARE9WrBxDWxrd0HSaCEnXDAeM9WaHNURwkkIS8TFIcmjwH89iRPuLfLEjbvkQbo5R0orxwg== 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=O527jGVuw2EWFjBbviEwIcNIxlmvQzNRhWu+YJnI4yo=; b=gZJibUX1QaQgHd7juozoraf0qDNRG0TjwudD5VQ8pEUPz+/Ja4rEfV4cHntSM3bKBxmD/VFvp2+460610rg7su+qYIaO++CjaBNQy/7ubZIpL8JaHsKKGJWimjMGQkdr5E2AoTWX5lB26Wg64dvZ/cFuiJLpxTUS8NXIzxThLFY= Authentication-Results: pengutronix.de; dkim=none (message not signed) header.d=none;pengutronix.de; dmarc=none action=none header.from=t2data.com; Received: from AS8P251MB0167.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:403::21) by AS8P251MB0294.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:34e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Wed, 8 Sep 2021 14:00:16 +0000 Received: from AS8P251MB0167.EURP251.PROD.OUTLOOK.COM ([fe80::dd37:4003:79e5:4b70]) by AS8P251MB0167.EURP251.PROD.OUTLOOK.COM ([fe80::dd37:4003:79e5:4b70%7]) with mapi id 15.20.4478.026; Wed, 8 Sep 2021 14:00:16 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Wed, 8 Sep 2021 16:00:02 +0200 Message-Id: <20210908140002.299517-8-christian.melki@t2data.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210908140002.299517-1-christian.melki@t2data.com> References: <20210908140002.299517-1-christian.melki@t2data.com> X-ClientProxiedBy: HE1PR07CA0043.eurprd07.prod.outlook.com (2603:10a6:7:66::29) To AS8P251MB0167.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:403::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plaid.hq.t2data.com (212.247.174.226) by HE1PR07CA0043.eurprd07.prod.outlook.com (2603:10a6:7:66::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.8 via Frontend Transport; Wed, 8 Sep 2021 14:00:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b64854f5-074c-4177-c652-08d972d0fc97 X-MS-TrafficTypeDiagnostic: AS8P251MB0294: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:785; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hNPegkcItSHmIfbCzY3/ulemXuk74gJvTtTV94zMkvo5ka0jdbR7nWclST0dFsOOft9mA3r+/vqiLNwl0bRXFbZlSnnCczbh0s9rS5rq9M9qgV30N2m7naolRXMLI2IxQHeAHUZz3q2a8YBoFViyjsmCmSpSIZDIBivOBzJoWgf9zo15Bj3cgSEdONT1MRHxH+dRCxniFe3IHQLxtydiXkvBPSKdwxQa5+NJE5gKafLLvNauhCrxAgl3Vx4OqDugczw83tUEG5g08xK7iGr4i+pB86yfTtKl8tskNip2JMFGrMH6/Ut/6gltuz7p63WJluxyXaTLSBzH5Ph2y60RNbttD3PCUo8+37h1qsY/PyDFKACRKvaNuKNOLIkz/HbZYOFpwfbGLYfKDlsHdMwiL+aRmPw0LTpltzJIa92x63m3sTnX2uw/9hH8qHeIt0aZcclxWgghzR2lotDQceDasg/GQjt5u5Up/9vK92W7nsHWjQIfUCx5LkJFja/D9m1gvrDfu/GGOmjZe0yA98y//TQYI9utdAzYIyv3d9tr5DtzOFj8nwBkHXnh4I2HCeqYDHUdIeWpLW7LeEkceaq575t5QyhNKceRHuIz9yDys08ZWMGFVjZkQXwuUH51QZs98yNabKXtzTYqhoWuvTjXHYv8qoB6za5LozN1Ev9GW12h0ygY/abrApWopZhMEEl3RTXB2x1HKJynfnwknTA5bw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8P251MB0167.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(366004)(42606007)(346002)(396003)(39830400003)(136003)(376002)(8936002)(44832011)(2616005)(316002)(956004)(86362001)(6666004)(478600001)(1076003)(7696005)(5660300002)(66476007)(66946007)(66556008)(26005)(186003)(8676002)(6486002)(6916009)(36756003)(83380400001)(52116002)(2906002)(38100700002)(38350700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FouPwz0ymdZxDAV3i5MwG7tbDmkKdW1klKXNehuYAS1LJMfB5N2mrp1Vj33/?= =?us-ascii?Q?9sOB076FWeisjOU5Z+RGjzibp0ZEvHypmrKdypbeN69inpINTQVYxHpcWLgK?= =?us-ascii?Q?loq+qQAh7bgB2Y796Hzohvc0ubYqEYnDK5j/kYWMzBcyTinMM32SpLKMqaDh?= =?us-ascii?Q?6CZDpX3oEE4HwzxsGhaqhS4pjmdNYQgJc1lKoVRIWJsU+KC93C1hQcjDZX5n?= =?us-ascii?Q?ZXgZu/8x13RGKmgf6FaiHd6o9hQihbdIqxrQKtjj3SEarTfaQsLtztQ2rmjO?= =?us-ascii?Q?aGNnltGI6Lgbw2zUlPFWhueoUyW1+zyeY0mYuU0/QDBx9sFImjBU6GoybApd?= =?us-ascii?Q?cfNY/zpzKveR6IadV25hCqsfnLLb5Rxt/JbxwytYqFqVZRPAO7C9yuzAHb0+?= =?us-ascii?Q?NTftwiXApd2JJR2WcZW2QCLnjIPPk7bIOjsHkjOYg2Kqgnj9x8JdY0NPq3E7?= =?us-ascii?Q?ZfTe4lzDLXOwlJ/bpLWFpFzyByfE47uLoWbdUlJ9OJvUDhlRAWDhjd9h/o87?= =?us-ascii?Q?zFpUDOQ3lRipS+reo4XCN69FqovCN0ebR4N6slNZ2f7usfP1vKfy50jFm7EM?= =?us-ascii?Q?T03VIQufvoFf378OZ7xkze9nMjODCKygZG9PYYC98voRRggIKNPvd37v+/dr?= =?us-ascii?Q?IzCZB1mtSBm9aMMwSdpdbTrIHxASXBccRVbteJE0CIuHOEF1cMDn5+exN8Ku?= =?us-ascii?Q?6+bmcM1fq1waCCG03CRyIn/9wMpHDofkEt9D1TOsa1GonlM4PSiwKXk0XDpA?= =?us-ascii?Q?5TmJFZXNdHehHwoNG4m8zHZ5GskHodWuEpICkgetQD89xtqwVPha6OMsTSwx?= =?us-ascii?Q?Ias+Bga8VRp10ErzK5QqJdvDaxBBGox95aRNqKTaVBu/C4fkLly68NooPuYT?= =?us-ascii?Q?e+e5reb+g3PbZjdfys+sxFm8x/7pp0jbi+O9SnYVNPZWBpYQe0XtOYgcY/1l?= =?us-ascii?Q?+tf8xVj0NpqKGbOeq8GN+nUTTj3XhOvGFPXonPADubf7LIKBiWXJXeNZwUtp?= =?us-ascii?Q?eeKlRf8naAinzS0GxwgTcDz0nanakVVBUi1KPaCBKxZxOUwNDh4g/8wRy3XW?= =?us-ascii?Q?D1wWr8biX6uDj2A/wBMyBolTgk/zxFCC/Cgkf/tEbSWHFvpJ6/NlwAJMn7q4?= =?us-ascii?Q?Ww9D6F+SarVUVa4axe8xT+xtDsKNkeH2UllJBFwDPBeAKip9GulAp/dQ+01S?= =?us-ascii?Q?2eAHFS+Xm78ECiBfng2w9btHySq+vLe+xav02rVk2eA5LBwSiSB2Tv20KJFs?= =?us-ascii?Q?XCqwxi68MAP6ATCxzfDJNYYv9EUbxMlPz7k57TF9XhsXmOtzMecgLuSuU+L2?= =?us-ascii?Q?Ms0+7P9VuSsXVwUyCk31hZOJ?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: b64854f5-074c-4177-c652-08d972d0fc97 X-MS-Exchange-CrossTenant-AuthSource: AS8P251MB0167.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2021 14:00:16.7051 (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: xh9XyStTGpDd00WNuQVeTsZ3qmgAHTxZRyO4BPIkh+P/8+ZdRL5lsLwW3vj1k949M2y6LHmWo2mtWG39zG0qUDM3jfmtT4Z9Wj9596Hngzc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P251MB0294 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.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 8/8] rules/mesalib.make: Use CROSS_LIB_DIR. 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 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 Let mesalib install various libraries in CROSS_LIB_DIR. --- rules/mesalib.make | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/rules/mesalib.make b/rules/mesalib.make index 945b7c523..a1f92224b 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -123,12 +123,12 @@ MESALIB_CONF_OPT := \ -Dbuild-aco-tests=false \ -Dbuild-tests=false \ -Dcustom-shader-replacement= \ - -Dd3d-drivers-path=/usr/lib/d3d \ + -Dd3d-drivers-path=/usr/$(CROSS_LIB_DIR)/d3d \ -Ddatasources=auto \ -Ddraw-use-llvm=true \ -Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \ - -Ddri-drivers-path=/usr/lib/dri \ - -Ddri-search-path=/usr/lib/dri \ + -Ddri-drivers-path=/usr/$(CROSS_LIB_DIR)/dri \ + -Ddri-search-path=/usr/$(CROSS_LIB_DIR)/dri \ -Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \ -Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \ -Degl-lib-suffix= \ @@ -161,7 +161,7 @@ MESALIB_CONF_OPT := \ -Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \ -Dmicrosoft-clc=disabled \ -Dmoltenvk-dir= \ - -Domx-libs-path=/usr/lib/dri \ + -Domx-libs-path=/usr/$(CROSS_LIB_DIR)/dri \ -Dopencl-native=false \ -Dopencl-spirv=false \ -Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \ @@ -185,14 +185,14 @@ MESALIB_CONF_OPT := \ -Dstatic-libclc=[] \ -Dswr-arches=[] \ -Dtools=[] \ - -Dva-libs-path=/usr/lib/dri \ + -Dva-libs-path=/usr/$(CROSS_LIB_DIR)/dri \ -Dvalgrind=disabled \ - -Dvdpau-libs-path=/usr/lib/vdpau \ + -Dvdpau-libs-path=/usr/$(CROSS_LIB_DIR)/vdpau \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \ -Dvulkan-icd-dir=/etc/vulkan/icd.d \ -Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \ -Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \ - -Dxvmc-libs-path=/usr/lib \ + -Dxvmc-libs-path=/usr/$(CROSS_LIB_DIR) \ -Dzlib=enabled \ -Dzstd=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d @@ -221,22 +221,22 @@ $(STATEDIR)/mesalib.targetinstall: @$(foreach lib, $(MESALIB_DRI_LIBS-y), \ $(call install_copy, mesalib, 0, 0, 0644, -, \ - /usr/lib/dri/$(lib)_dri.so)$(ptx/nl)) + /usr/$(CROSS_LIB_DIR)/dri/$(lib)_dri.so)$(ptx/nl)) ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),) @$(call install_copy, mesalib, 0, 0, 0644, \ - $(MESALIB_PKGDIR)/usr/lib/dri/$(firstword $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \ - /usr/lib/dri/gallium_dri.so) + $(MESALIB_PKGDIR)/usr/$(CROSS_LIB_DIR)/dri/$(firstword $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \ + /usr/$(CROSS_LIB_DIR)/dri/gallium_dri.so) @$(foreach lib, $(MESALIB_DRI_GALLIUM_LIBS-y), \ $(call install_link, mesalib, gallium_dri.so, \ - /usr/lib/dri/$(lib)_dri.so)$(ptx/nl)) + /usr/$(CROSS_LIB_DIR)/dri/$(lib)_dri.so)$(ptx/nl)) endif ifneq ($(strip $(MESALIB_VULKAN_LIBS-y)),) @$(foreach lib, $(MESALIB_VULKAN_LIBS-y), \ $(call install_copy, mesalib, 0, 0, 0644, -, \ - /usr/lib/libvulkan_$(lib).so)$(ptx/nl) \ + /usr/$(CROSS_LIB_DIR)/libvulkan_$(lib).so)$(ptx/nl) \ $(call install_glob, mesalib, 0, 0, -, \ /etc/vulkan/icd.d, */$(lib)_icd.*.json)$(ptx/nl)) endif -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de