From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 06 Jun 2023 09:01:39 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q6QhI-00CkBQ-FZ for lore@lore.pengutronix.de; Tue, 06 Jun 2023 09:01:39 +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 1q6QhF-0006FR-R7; Tue, 06 Jun 2023 09:01:37 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q6Qg7-0004Yk-2v; Tue, 06 Jun 2023 09:00:27 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1q6Qg6-005RbW-Fi; Tue, 06 Jun 2023 09:00:26 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q6Qg5-001aWT-SB; Tue, 06 Jun 2023 09:00:25 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 6 Jun 2023 09:00:25 +0200 Message-Id: <20230606070025.378571-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230602135903.694427-6-p.zabel@pengutronix.de> References: <20230602135903.694427-6-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] vulkan-tools: version bump 1.3.246.1 -> 1.3.250.0 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: Philipp Zabel 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 Thanks, applied as 56957d643ab7e9cfed9a4d6c496cf9b8a9c21b37. Michael [sent from post-receive hook] On Tue, 06 Jun 2023 09:00:25 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20230602135903.694427-6-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch b/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch > new file mode 100644 > index 000000000000..c13f0b026a84 > --- /dev/null > +++ b/patches/vulkan-tools-1.3.250.0/0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch > @@ -0,0 +1,34 @@ > +From: Philipp Zabel > +Date: Tue, 16 May 2023 10:04:03 +0200 > +Subject: [PATCH] Stop overwriting CMAKE_FIND_ROOT_PATH when cross compiling > + > +PTXdist uses CMAKE_FIND_ROOT_PATH [1] to instruct CMake where to find > +package information when cross-compiling. Stop overwriting this with > +the contents of CMAKE_PREFIX_PATH [2] in the build system. > + > +[1] https://cmake.org/cmake/help/v3.25/variable/CMAKE_FIND_ROOT_PATH.html > +[2] https://cmake.org/cmake/help/v3.25/variable/CMAKE_PREFIX_PATH.html > + > +This issue was introduced with commit e99e3c640ab7 ("cmake: Add > +UPDATE_DEPS functionality"). It is similar to the same issue in > +vulkan-validationlayers. > + > +Signed-off-by: Philipp Zabel > +--- > + scripts/CMakeLists.txt | 6 +----- > + 1 file changed, 1 insertion(+), 5 deletions(-) > + > +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt > +index 5b979d43de59..3b1ddbdff685 100644 > +--- a/scripts/CMakeLists.txt > ++++ b/scripts/CMakeLists.txt > +@@ -113,8 +113,4 @@ if (MOLTENVK_REPO_ROOT) > + list(APPEND CMAKE_PREFIX_PATH ${MOLTENVK_REPO_ROOT}) > + endif() > + > +-if (CMAKE_CROSSCOMPILING) > +- set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) > +-else() > +- set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) > +-endif() > ++set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) > diff --git a/patches/vulkan-tools-1.3.250.0/series b/patches/vulkan-tools-1.3.250.0/series > new file mode 100644 > index 000000000000..3ed158f8be1d > --- /dev/null > +++ b/patches/vulkan-tools-1.3.250.0/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-Stop-overwriting-CMAKE_FIND_ROOT_PATH-when-cross-com.patch > +# ea2ba1941cc64bfae752632f0830f963 - git-ptx-patches magic > diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make > index dfe608e4a389..fb0d2ff69b27 100644 > --- a/rules/vulkan-tools.make > +++ b/rules/vulkan-tools.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_TOOLS) += vulkan-tools > # > # Paths and names > # > -VULKAN_TOOLS_VERSION := 1.3.246.1 > -VULKAN_TOOLS_MD5 := b6a7c6c46d9ca6c75ce6b9f3777b8e5f > +VULKAN_TOOLS_VERSION := 1.3.250.0 > +VULKAN_TOOLS_MD5 := 3443149cd1e65abdc4d81ff9f4a2d8ea > VULKAN_TOOLS := vulkan-tools-$(VULKAN_TOOLS_VERSION) > VULKAN_TOOLS_SUFFIX := tar.gz > VULKAN_TOOLS_URL := https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX) > @@ -40,7 +40,9 @@ VULKAN_TOOLS_CONF_OPT := \ > -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_TOOLS_XCB) \ > -DBUILD_WSI_XLIB_SUPPORT=OFF \ > -DENABLE_ADDRESS_SANITIZER=OFF \ > - -DINSTALL_ICD=OFF > + -DINSTALL_ICD=OFF \ > + -DTOOLS_CODEGEN=OFF \ > + -DUPDATE_DEPS=OFF > > ifdef PTXCONF_VULKAN_TOOLS_CUBE > VULKAN_TOOLS_CONF_OPT += \