diff options
Diffstat (limited to 'sys-apps/hwloc')
| -rw-r--r-- | sys-apps/hwloc/Manifest | 5 | ||||
| -rw-r--r-- | sys-apps/hwloc/files/hwloc-2.11.2-fix-enable-gl.patch | 27 | ||||
| -rw-r--r-- | sys-apps/hwloc/hwloc-2.11.2.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/hwloc/hwloc-2.9.3-r1.ebuild | 7 |
4 files changed, 42 insertions, 4 deletions
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest index c17f61ba6c6e..6aa62815c663 100644 --- a/sys-apps/hwloc/Manifest +++ b/sys-apps/hwloc/Manifest @@ -1,4 +1,5 @@ AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33 +AUX hwloc-2.11.2-fix-enable-gl.patch 994 BLAKE2B 3278bd6b47dfa8b3b95f5f24acd43d6fb7c0c18207a1394938645d5091964f69349ee0c32f3fa04bad1ac420915797906e58b1e564a390b264aa9cb9d0aa25d3 SHA512 003816f1b9b13fa8698aad2f2f6b23de98aa1f9ea3d978da3bf1dc98f7f7f6e7ae9faa01e6a1a17546ea06b5a35d2d0bf68f6e6487dd0a03ef2cdd5e1f62633b DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138 DIST hwloc-2.11.2.tar.bz2 5592269 BLAKE2B e4764883eb3678fba6d6bd30fba27d68bd15cefccfcbc9d628573447f5f507a348e197d5003cc016fd4e27da05dc8c0ebd8644a4530f8499016d255c62602fc2 SHA512 488bfdeb32d2b98cffc43a537e87422d70abcc2bc029e4b5c911fc3e37189a9213dc8efd5552e2fda0d2b03d4ec25ebd45e0680dd129da046798750c5f5eb72f DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df @@ -9,11 +10,11 @@ DIST hwloc-2.9.2.tar.bz2 6976699 BLAKE2B 70737325888b87f90f95799490621e209864430 DIST hwloc-2.9.3.tar.bz2 6986142 BLAKE2B db47dcf7fbedb67e3e339faf2f88326cc5b9838747b40774a6dbfc29bb9e52797ae9da9ae098168f70ff47cd7ff3e949a2294da52e91f2e45c0d9bc25bdbb1b7 SHA512 181a700ed036ecc8a6685e8023f3f6ba317b5fd3bb0699d9081e4627f375df7e9791148965d92f8152f6e7ea5c4ba7c581a0cad5a717d408725faae79777e267 DIST lstopo.png 18008 BLAKE2B 5468cc81f9ee4b9a4dd28bd9334edd7f4e7d4ff394caf09228b4e860ab924bb80114b977b1b1125cd180478967d2f3bbde50435522b77a8314f823b1c2678e75 SHA512 8a8a6e62c3089a8d77f592a348ad87fca14a84bdecd889760a37bef8e65c876594b91091aac2f54ca3cca855a02459fe1c960909ccd0ddea1ff77c95bb171823 EBUILD hwloc-1.11.13-r1.ebuild 2164 BLAKE2B 48b1516072987098c610f1de0cb8f59f19b8d5ad13a72b0fb382ab8ff5292177b563db5e6b3db451838824477b57e2f16b1d9e9c618c248218862bc7af9ce1c5 SHA512 7ba0f9ddec1fb25cfbadf63eec2d68feca43a2436a675816aaf760e42ae4ae766e3842a45c8343b93d4c02f142bfb8e9ddc9d2ffbb641de58b7da1c43f996360 -EBUILD hwloc-2.11.2.ebuild 3838 BLAKE2B 8c17838926d6cdc010bbe6ea38ad7f0a8344ecaac83ca78d5af91b80367377b1f5e967b2e9acd13a31e444c5bfe9a5a08db723ded428167750e4251b368747a9 SHA512 4db63c019e40cc8caf45aa17bddd819c6486dd13e25dc362603d332190fdbeb8203cf9e66fe9271a7ea2eff3f16efc2e7d374f7f13c2356d28112973e1db4f58 +EBUILD hwloc-2.11.2.ebuild 3942 BLAKE2B 5d27ca82431e61358b65ace6f72c4ef8e4c036323861fc921defe4a4cee389e642336b506b3422cb590c766781039083c8a85d32577625adc19dcd4a86e53463 SHA512 0a74ea43209ff13c7c3aa62db40b33697e1a26a4fa58603b7172e3534cb1056bcf075be4c4c39774269485bf314fd28da69125a0b060b80cfedb2171c208eed2 EBUILD hwloc-2.6.0-r1.ebuild 2968 BLAKE2B 393891bc266c754647a2433c3d17046090e3b9eae4b627eaa4c749012711c9ef1d42f50435e211052175e3ee83931f0f01abf297bec60eebad85d74d3fe508f3 SHA512 6768f80f09b2cb4dbac35727a09ec2df3104d7e5cc06b8b33131190938571050047766aecf0b922dcc1580f8db9e0d116b21f2d534a4a4566dd1f5b300b1546f EBUILD hwloc-2.8.0-r1.ebuild 3341 BLAKE2B a71739e448497cc53f3482a30f944e553b2a5ec14d43a98a4fe7cb6e6530eed65768c6113df6d4951c9f16e10e703312a4373f2cb4d764be4ae58b1a40b56eec SHA512 a4f4d54b329f1f4040e8b305b56330fa78c16f4b8548068bc052ff42eea42f769aa2a35b95830aa36adfda42208598e80f8ef6dbbaf12623f9e5185644c9a3c1 EBUILD hwloc-2.9.0.ebuild 3348 BLAKE2B 4e5139cf1b957d7cbff0bd7d04fbb4ef3dd967a770edbc9ca489502d0dec4f63f1713f21b53c89d3073790d6bfefc2057e1329383c45a4eecbcf35dbff6661fd SHA512 e0a8f546089a220470c740d4bf7012633169d08c7f0c7df24a4b710ae881b681cdc65adb5d79a82d28d4e274d9f5e26dccf5e0793e85a2902042797bf72a5ec9 EBUILD hwloc-2.9.1.ebuild 3545 BLAKE2B 43097a39ee8c5ca8c64f83c6141d531d4031bcd29a33a6f0a8c917c1f60b43c19e137406df6972cf0718dea9b99ebb4f879f2fee7646ac9183921eba299f90a4 SHA512 cbba54843d499222f617d066e4e9d55e56d8ed539597392f260f3fa8e39b0be1c25d44b154731968779dfbf5c1c1551dc112f8be764616f50d27d1d1c644f8da EBUILD hwloc-2.9.2.ebuild 3496 BLAKE2B 0ca3783a8408c007e9c20b881ecfca80acfb1c65b0c27c4033d3d6d369e79dad0bbe0cc52ef5dc0426ec6a5da1d1f754183037a27b42686e27235152d80a9440 SHA512 44ae7def2e9e51af6d03dd33a14834255afc5b8f6d6129b1b755731fd49541103e97d333c25e5d36b2ffeec1deff51f9f5e264418389faee8a959f769380fc70 -EBUILD hwloc-2.9.3-r1.ebuild 3925 BLAKE2B 8f7ccf53b3138077e06ad7b7fd3dbb212b7d3e38e3039a946a24e102f2073b262682006372146d763a3ab7cacf1dd769b82b653aaac292e78507e7d8b711cacc SHA512 457eaddf324515d1b01d008ca93b5bb0a2f7375a981c44eae93f78a4cd0557543093ca43473c44c436f3f9f7e8bddca99b8f8dddd5da906d898521492fa42a2a +EBUILD hwloc-2.9.3-r1.ebuild 4029 BLAKE2B 4014e6e92751297be15c13e117927a6bc3d1c997c3effbd9d17c74e57ba45de743960dac36e001c81ca1e8e351c129a2813e101782e0a7617cb43d4d982c0b83 SHA512 a3c1ef8a60b07850f7eaee5efaa5a5702fc9020e4b4a0f0fbcc804b7d2df1f929f9d58bb6dfbaecd03769ee6d308be9aecd3c3687c108fabf561ebdafd7d4d56 MISC metadata.xml 1867 BLAKE2B b6eb3112a3fa477986a423c6cddc4207ccfe2e5a97cef855541c51640dd7b216159810dd748db8072bc65d0ed9ca6526cae9c867ca3d692d4058bdcd4a49ad2c SHA512 99c7bfb6c92c71a9a43c752bb4fbb82a8389d2238c7d2178b7d53fe59f6d086460999ac6e42eea95eada66903559b66ee311acf18c7a01537b573544a900dbec diff --git a/sys-apps/hwloc/files/hwloc-2.11.2-fix-enable-gl.patch b/sys-apps/hwloc/files/hwloc-2.11.2-fix-enable-gl.patch new file mode 100644 index 000000000000..25e2b2c8f791 --- /dev/null +++ b/sys-apps/hwloc/files/hwloc-2.11.2-fix-enable-gl.patch @@ -0,0 +1,27 @@ +From fe2eb291c5d91a02f01a051de150acfe37598ade Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Tue, 11 Mar 2025 14:36:05 +0100 +Subject: [PATCH] fix enable-gl + +Disable -Wno-error=lto-type-mismatch for broken AC_CHECK_LIB + +Bug: https://bugs.gentoo.org/949986 +Bug: https://bugs.gentoo.org/934428 +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/config/hwloc.m4 b/config/hwloc.m4 +index 832ab39..4149089 100644 +--- a/config/hwloc.m4 ++++ b/config/hwloc.m4 +@@ -1488,7 +1488,7 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL); + hwloc_gl_happy=no]) + + AC_CHECK_HEADERS([NVCtrl/NVCtrl.h], [ +- AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], [hwloc_gl_happy=no], [-lXext -lX11]) ++ AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], [hwloc_gl_happy=no], [-lXext -lX11 -Wno-error=lto-type-mismatch]) + ], [hwloc_gl_happy=no]) + + if test "x$hwloc_gl_happy" = "xyes"; then +-- +2.48.1 + diff --git a/sys-apps/hwloc/hwloc-2.11.2.ebuild b/sys-apps/hwloc/hwloc-2.11.2.ebuild index e3e3e1709236..eb948e32bdb0 100644 --- a/sys-apps/hwloc/hwloc-2.11.2.ebuild +++ b/sys-apps/hwloc/hwloc-2.11.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -54,6 +54,11 @@ DOCS=( AUTHORS NEWS README VERSION ) src_prepare() { default + # bug #934428 #949986 + if tc-is-gcc; then + eapply "${FILESDIR}/${PN}-2.11.2-fix-enable-gl.patch" + fi + eautoreconf } diff --git a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild index 8282112e6b86..8cb15d78d7cf 100644 --- a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild +++ b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -54,6 +54,11 @@ DOCS=( AUTHORS NEWS README VERSION ) src_prepare() { default + # bug #934428 #949986 + if tc-is-gcc; then + eapply "${FILESDIR}/${PN}-2.11.2-fix-enable-gl.patch" + fi + eautoreconf } |