diff options
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/Manifest.gz | bin | 11364 -> 11368 bytes | |||
-rw-r--r-- | sys-cluster/openmpi/Manifest | 3 | ||||
-rw-r--r-- | sys-cluster/openmpi/files/openmpi-4.1.6-incompatible-pointers.patch | 181 | ||||
-rw-r--r-- | sys-cluster/openmpi/openmpi-4.1.6.ebuild | 4 | ||||
-rw-r--r-- | sys-cluster/pmix/Manifest | 6 | ||||
-rw-r--r-- | sys-cluster/pmix/pmix-4.2.2-r1.ebuild | 3 | ||||
-rw-r--r-- | sys-cluster/pmix/pmix-4.2.8.ebuild | 1 | ||||
-rw-r--r-- | sys-cluster/pmix/pmix-5.0.2.ebuild | 13 |
8 files changed, 201 insertions, 10 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex cebff8eaa385..a97c8b36bb2f 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest index 14c587367a7e..f5ed70f4b3e2 100644 --- a/sys-cluster/openmpi/Manifest +++ b/sys-cluster/openmpi/Manifest @@ -1,7 +1,8 @@ +AUX openmpi-4.1.6-incompatible-pointers.patch 8095 BLAKE2B c095a4c0c3fba74a8c1f111b5983b77811ce98d5b36dc74e1f1f8de97df4037ef62716acacf35fe1c832348a6dbedd15d0069a6a64e713caf0ddafa36bc491d6 SHA512 8e8d3027262605189b4a54d66ca8293651aecaf88432e038c178b66ee2f8f0e6d4b57410ad2b3e9cf23af2002ba83e972c799de8f3b0e3748b9c5badc86ab5b8 DIST openmpi-4.1.4.tar.bz2 10042839 BLAKE2B b020e3530ae5dde7b144e7c33b1a3f26f622526a4b48a97a0956fc6f49bbf9dfd5be9ebeeaf3bdc5168a307507408ba5dd8e2a537148821e1d476678177dc5d6 SHA512 c70a92c9b16b8c76a871183f9b180d60861186e64140da897d206d53bc06213f31ea93b31734645f580f4bf28dda5605d85dbce2417e4596955384d961bed653 DIST openmpi-4.1.5.tar.bz2 10045426 BLAKE2B 135a8373ed6173b7a94def18e3b964c6b6050c909382e0dbb1898a6d261ae428931358121ef6d325d303f4f510017a94970f7c66b280a5fc460365821f36dece SHA512 7a2188684ed7542fe42e1717ae72cb859b4f3d6f722c9d3ba04bfed6c2178b3e7da3a536629d312c23571fed4d9b2ca5e20e85898ae5144e9332bd898e6e1cc6 DIST openmpi-4.1.6.tar.bz2 10017002 BLAKE2B 4f119e1ed9b8787f0f860295ab1721fe2fd5300b8e182230a9eba3a864680b02bbd30618cc6d798a693a121626fc0ad5f447144d9ba91becb734f1a530d7a23a SHA512 0ef3240f9c436fb19b67e836cac376eafeb7825d12de3387dad04329dee9f182799d17d785ea23eba763810f479015bb5230593c28950b616b2f0aa1c0a81e71 EBUILD openmpi-4.1.4-r1.ebuild 5763 BLAKE2B 7e227f94d01dc4fa76b1b082268f875618d3f7c20b90b37ee19bb52c5452e3767f68be3d90becdee033dea8ecb09f15996bb75ec3825ae9ac35958beb01512ae SHA512 720732ec40127fd1dacd080349443041c46066e8d88feb95d1059f83f7757b55598057a0fae15cf7dac8f83fa4c0c88be53e1e93544d1dd1b6b39045fa5a2357 EBUILD openmpi-4.1.5.ebuild 5068 BLAKE2B faf4e7fad6741faf90d8fbd98df363a2c25d804819998d1cd6c8743216c54b376bb28cef66a0f2a2d4d24f9b4207cc7ceaba4c9d73fba4b22357b472dbdbf97e SHA512 96b5874bdfc7bb267f04bb29c1b20b819504efc70e3d207c3a53a160f191c40de86ea655aa6dcf2036259ab4917c4366b1c9944089b0ae8b25533f91a41cb6f5 -EBUILD openmpi-4.1.6.ebuild 5222 BLAKE2B dee61adb903fd1f752edf4c97ff5cc5cba5d15d9ff1415f1a9ded8200175d80a35276c6eec461dc2987294127ea42e4f6ef89b76e2c1a0cdb5b966ada77bd0a8 SHA512 c9a36e15a3d3ef00a2753ae1f0cb27894aa709dfebb1cde3d06a34053982aeb362c8057438052e9d76392f12cbee9c9f30182c5fc709f1903fb0f31a33511d48 +EBUILD openmpi-4.1.6.ebuild 5290 BLAKE2B 55ded8b030341cb98a6604e24882a5ce348e036fb67c21647837a4050b95fc5ddd7e607158e3865dab8deba26fa2e5027dd2e34f975d25fcf28ce7c1516ffa59 SHA512 2e471b71197f6757b1830d1e1a3c8c972af5c2a9ba984b8e00d9a6202e376c84847227896510e2d053459f91377877322cfc80e7f2a0ff7a1a29916c1e832685 MISC metadata.xml 619 BLAKE2B e1073cdab4b3b0013354a95a53354f1040edbde8cb0f864a28ca1a9e9e7f6974e2db4a9a885c8616cfba41b7b472af4168d92ad3b5cd9e051598db1a4d4d2889 SHA512 b76a5bd4fdbdc47c21b06681a8365f5d0baf7b121a88146b87a4a609d01b9008aeae070130c86be89586bfeff73b325bda4b4fa83dc150f3c5865e5d0f422995 diff --git a/sys-cluster/openmpi/files/openmpi-4.1.6-incompatible-pointers.patch b/sys-cluster/openmpi/files/openmpi-4.1.6-incompatible-pointers.patch new file mode 100644 index 000000000000..9f9ae4008ad6 --- /dev/null +++ b/sys-cluster/openmpi/files/openmpi-4.1.6-incompatible-pointers.patch @@ -0,0 +1,181 @@ +--- a/ompi/mca/io/romio321/romio/adio/common/ad_coll_exch_new.c ++++ b/ompi/mca/io/romio321/romio/adio/common/ad_coll_exch_new.c +@@ -154,7 +154,7 @@ void ADIOI_Exch_file_views(int myrank, int nprocs, int file_ptr_type, + } + + MPI_Type_get_extent(fd->filetype, &lb, &filetype_extent); +- MPI_Type_size_x(fd->filetype, &filetype_sz); ++ MPI_Type_size_x(fd->filetype, (MPI_Count *)&filetype_sz); + if (filetype_extent == filetype_sz) { + flat_file_p = ADIOI_Add_contig_flattened(fd->filetype); + flat_file_p->blocklens[0] = memtype_sz*count; +--- a/ompi/mca/io/romio321/romio/adio/common/ad_read_coll.c ++++ b/ompi/mca/io/romio321/romio/adio/common/ad_read_coll.c +@@ -851,7 +851,7 @@ static void ADIOI_R_Exchange_data(ADIO_File fd, void *buf, ADIOI_Flatlist_node + others_req[i].lens[k] = partial_send[i]; + } + ADIOI_Type_create_hindexed_x(count[i], +- &(others_req[i].lens[start_pos[i]]), ++ (const MPI_Count *)&(others_req[i].lens[start_pos[i]]), + &(others_req[i].mem_ptrs[start_pos[i]]), + MPI_BYTE, &send_type); + /* absolute displacement; use MPI_BOTTOM in send */ +--- a/ompi/mca/io/romio321/romio/adio/common/ad_write_coll.c ++++ b/ompi/mca/io/romio321/romio/adio/common/ad_write_coll.c +@@ -610,7 +610,7 @@ static void ADIOI_W_Exchange_data(ADIO_File fd, void *buf, char *write_buf, + others_req[i].lens[k] = partial_recv[i]; + } + ADIOI_Type_create_hindexed_x(count[i], +- &(others_req[i].lens[start_pos[i]]), ++ (const MPI_Count *)&(others_req[i].lens[start_pos[i]]), + &(others_req[i].mem_ptrs[start_pos[i]]), + MPI_BYTE, recv_types+j); + /* absolute displacements; use MPI_BOTTOM in recv */ +--- a/ompi/mca/io/romio321/romio/mpi-io/get_bytoff.c ++++ b/ompi/mca/io/romio321/romio/mpi-io/get_bytoff.c +@@ -63,7 +63,7 @@ int MPI_File_get_byte_offset(MPI_File fh, MPI_Offset offset, MPI_Offset *disp) + MPIO_CHECK_NOT_SEQUENTIAL_MODE(adio_fh, myname, error_code); + /* --END ERROR HANDLING-- */ + +- ADIOI_Get_byte_offset(adio_fh, offset, disp); ++ ADIOI_Get_byte_offset(adio_fh, (ADIO_Offset)offset, (ADIO_Offset *)disp); + + fn_exit: + +--- a/ompi/mca/io/romio321/romio/mpi-io/get_posn.c ++++ b/ompi/mca/io/romio321/romio/mpi-io/get_posn.c +@@ -52,7 +52,7 @@ int MPI_File_get_position(MPI_File fh, MPI_Offset *offset) + MPIO_CHECK_NOT_SEQUENTIAL_MODE(adio_fh, myname, error_code); + /* --END ERROR HANDLING-- */ + +- ADIOI_Get_position(adio_fh, offset); ++ ADIOI_Get_position(adio_fh, (ADIO_Offset *)offset); + + fn_exit: + return MPI_SUCCESS; +--- a/ompi/mca/io/romio321/romio/mpi-io/get_posn_sh.c ++++ b/ompi/mca/io/romio321/romio/mpi-io/get_posn_sh.c +@@ -53,7 +53,8 @@ int MPI_File_get_position_shared(MPI_File fh, MPI_Offset *offset) + + ADIOI_TEST_DEFERRED(adio_fh, myname, &error_code); + +- ADIO_Get_shared_fp(adio_fh, 0, offset, &error_code); ++ ++ ADIO_Get_shared_fp(adio_fh, 0, (ADIO_Offset *)offset, &error_code); + /* --BEGIN ERROR HANDLING-- */ + if (error_code != MPI_SUCCESS) + error_code = MPIO_Err_return_file(adio_fh, error_code); +--- a/ompi/mca/io/romio321/romio/mpi-io/seek.c ++++ b/ompi/mca/io/romio321/romio/mpi-io/seek.c +@@ -73,7 +73,7 @@ int MPI_File_seek(MPI_File fh, MPI_Offset offset, int whence) + break; + case MPI_SEEK_CUR: + /* find offset corr. to current location of file pointer */ +- ADIOI_Get_position(adio_fh, &curr_offset); ++ ADIOI_Get_position(adio_fh, (ADIO_Offset *)&curr_offset); + offset += curr_offset; + + /* --BEGIN ERROR HANDLING-- */ +@@ -94,7 +94,7 @@ int MPI_File_seek(MPI_File fh, MPI_Offset offset, int whence) + ADIOI_TEST_DEFERRED(adio_fh, "MPI_File_seek", &error_code); + + /* find offset corr. to end of file */ +- ADIOI_Get_eof_offset(adio_fh, &eof_offset); ++ ADIOI_Get_eof_offset(adio_fh, (ADIO_Offset *)&eof_offset); + offset += eof_offset; + + /* --BEGIN ERROR HANDLING-- */ +--- a/ompi/mca/io/romio321/romio/mpi-io/seek_sh.c ++++ b/ompi/mca/io/romio321/romio/mpi-io/seek_sh.c +@@ -101,7 +101,7 @@ int MPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence) + break; + case MPI_SEEK_CUR: + /* get current location of shared file pointer */ +- ADIO_Get_shared_fp(adio_fh, 0, &curr_offset, &error_code); ++ ADIO_Get_shared_fp(adio_fh, 0, (ADIO_Offset *)&curr_offset, &error_code); + /* --BEGIN ERROR HANDLING-- */ + if (error_code != MPI_SUCCESS) + { +@@ -130,7 +130,7 @@ int MPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence) + break; + case MPI_SEEK_END: + /* find offset corr. to end of file */ +- ADIOI_Get_eof_offset(adio_fh, &eof_offset); ++ ADIOI_Get_eof_offset(adio_fh, (ADIO_Offset *)&eof_offset); + offset += eof_offset; + /* --BEGIN ERROR HANDLING-- */ + if (offset < 0) +--- a/opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c ++++ b/opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c +@@ -638,7 +638,7 @@ static int find_hole(pmix_hwloc_vm_hole_kind_t hkind, + switch (hkind) { + case VM_HOLE_BEGIN: + fclose(file); +- return use_hole(0, begin, addrp, size); ++ return use_hole(0, begin, (unsigned long *)addrp, size); + + case VM_HOLE_AFTER_HEAP: + if (prevmkind == VM_MAP_HEAP && mkind != VM_MAP_HEAP) { +@@ -646,14 +646,14 @@ static int find_hole(pmix_hwloc_vm_hole_kind_t hkind, + * (there can be several of them consecutively). + */ + fclose(file); +- return use_hole(prevend, begin-prevend, addrp, size); ++ return use_hole(prevend, begin-prevend, (unsigned long *)addrp, size); + } + break; + + case VM_HOLE_BEFORE_STACK: + if (mkind == VM_MAP_STACK) { + fclose(file); +- return use_hole(prevend, begin-prevend, addrp, size); ++ return use_hole(prevend, begin-prevend, (unsigned long *)addrp, size); + } + break; + +@@ -705,7 +705,7 @@ static int find_hole(pmix_hwloc_vm_hole_kind_t hkind, + done: + fclose(file); + if (hkind == VM_HOLE_IN_LIBS || hkind == VM_HOLE_BIGGEST) { +- return use_hole(biggestbegin, biggestsize, addrp, size); ++ return use_hole(biggestbegin, biggestsize, (unsigned long *)addrp, size); + } + + return PMIX_ERROR; +--- a/orte/mca/rtc/hwloc/rtc_hwloc.c ++++ b/orte/mca/rtc/hwloc/rtc_hwloc.c +@@ -608,7 +608,7 @@ static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind, + switch (hkind) { + case VM_HOLE_BEGIN: + fclose(file); +- return use_hole(0, begin, addrp, size); ++ return use_hole(0, begin, (unsigned long *)addrp, size); + + case VM_HOLE_AFTER_HEAP: + if (prevmkind == VM_MAP_HEAP && mkind != VM_MAP_HEAP) { +@@ -616,14 +616,14 @@ static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind, + * (there can be several of them consecutively). + */ + fclose(file); +- return use_hole(prevend, begin-prevend, addrp, size); ++ return use_hole(prevend, begin-prevend, (unsigned long *)addrp, size); + } + break; + + case VM_HOLE_BEFORE_STACK: + if (mkind == VM_MAP_STACK) { + fclose(file); +- return use_hole(prevend, begin-prevend, addrp, size); ++ return use_hole(prevend, begin-prevend, (unsigned long *)addrp, size); + } + break; + +@@ -678,7 +678,7 @@ static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind, + done: + fclose(file); + if (hkind == VM_HOLE_IN_LIBS || hkind == VM_HOLE_BIGGEST) { +- return use_hole(biggestbegin, biggestsize, addrp, size); ++ return use_hole(biggestbegin, biggestsize, (unsigned long *)addrp, size); + } + + return ORTE_ERROR; diff --git a/sys-cluster/openmpi/openmpi-4.1.6.ebuild b/sys-cluster/openmpi/openmpi-4.1.6.ebuild index cd171b1263f5..ce638f5a87a7 100644 --- a/sys-cluster/openmpi/openmpi-4.1.6.ebuild +++ b/sys-cluster/openmpi/openmpi-4.1.6.ebuild @@ -64,6 +64,10 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/openmpi/mpiext/mpiext_cuda_c.h ) +PATCHES=( + "${FILESDIR}/${PN}-4.1.6-incompatible-pointers.patch" +) + pkg_setup() { fortran-2_pkg_setup diff --git a/sys-cluster/pmix/Manifest b/sys-cluster/pmix/Manifest index 33fc18591297..2b84a4b5a277 100644 --- a/sys-cluster/pmix/Manifest +++ b/sys-cluster/pmix/Manifest @@ -1,7 +1,7 @@ DIST pmix-4.2.2.tar.bz2 1639600 BLAKE2B b5109900e52750656200e7bdbdc39d870a01f5afc1fb622663dfb2c9647b1735c23ece906064b34923977c522fb5a89afc03d81b7d115b26337934ab5bfe7ce3 SHA512 b7cb1e2079d517b32fc5d99012a7c4b161c1509b3ac1e0ba7e4697f2fe0917455927d06c86ecab5f2fa6073e1f058e86260d2115b6f8cc968a43a5675439f28d DIST pmix-4.2.8.tar.bz2 4800886 BLAKE2B 49c6c74f2a3d4826ade004e2ca69f8adafb26232b8fe92f5e620e11f93bde6a84a3611e737818564a3a5fd6fb75a4819250fa038e55aab46cf0a29c3f04e9f7e SHA512 2bc78cda82af24a9d7db204684e1778e0db183acc425095a91d46e4253209cec06542d497d5502c502b946b0ed1517f3b34f532d1107ccac1a09f2f267f14089 DIST pmix-5.0.2.tar.bz2 4875774 BLAKE2B b15c3d4829e5b763ad9ce0f7a8e78b1eeedea829524b55b21801a397329576b66b8807e41cb0735e5a02f2f3b93d2b9ed14cf237b582e1462178cc96200350af SHA512 f6c35a551dec7eeda887087a731ef447caa7754aeab42e6bf7f054f7ec5a376863b4836b8c4cc04a3e3630f93939dd9ba08dd9823172dfbcf2d68d9243cbcbdc -EBUILD pmix-4.2.2-r1.ebuild 757 BLAKE2B 1af68a8826169972579359c8f27aa8076cc92a1da5dc88053604e4a315ed833553283ef2415d5645b13849c08e3c81b24654e3ed3f3a251b1013a0a623d8a86a SHA512 18808e9087e9a3e4258d46f85ca48df5912940f17335603012ab148ab67bde50587c4dd231084cbe92c09a56a8e1e31ff567de171ae03f274189a381dcd87e0f -EBUILD pmix-4.2.8.ebuild 1046 BLAKE2B d9fcfa388d0c508605aa5dda6286134664ad22979bc692956ecf04ee78899b051693809818419295f684c80c09a0e90e405a0a090e9392086e9c1945941d0bca SHA512 51b3c8731781fb9adfd408f9d87fb68992b6b81cee9112b69e174925bcba12b500fe5b2f86277cabd7aa7be550a1f8ced05b32507cc6ded721c11931ef6d9892 -EBUILD pmix-5.0.2.ebuild 1003 BLAKE2B b81f1db25eabf4d749eb2c2c39c7ec087ba0d7b90f2e7018bd40cd0ab5597eeab8199da150d368685ced8976002843acfc9e657aed82204892e13e8deff76b3d SHA512 e24f9e745f66496cd01b9564b9d73436e0eab3a12b5763c9cadd9cb6adf170d06a0b707c0952a690bec36c47bd0f29c965c4d36f7e1f901a2a8e59f86f4373e7 +EBUILD pmix-4.2.2-r1.ebuild 736 BLAKE2B e614cdf2231ea72840c50afd989665436fcdc2145b6ce98027794637e206c4e307728d76320060960e3deb19dc1962b06dae229a963e747e5275e623f4c814ae SHA512 445009dd71a34c48dfc8b1cb5e8a476bc9dbeec9f9e91c6eab19677e6b295dae8308c934a947c9376eeb453f5d587c65994028479fdabe870ea67c5033d93e0e +EBUILD pmix-4.2.8.ebuild 1025 BLAKE2B 780321a335637a5b1208627e24ea5c01039ca92e3e2f4a8288cd148f2d21052f285c70dc14043279c07eaff7017b3b3891c7d452cf5e2a3095934390be69bfe3 SHA512 19d5b0e06f1aeb400dbfc44baf089b2d43cd04b9f489f3c9f22f6e1a8cc30647928885c175344562a3ef8529480e0d4dc11ca99728899a64962212cc748f0871 +EBUILD pmix-5.0.2.ebuild 1161 BLAKE2B e7b6505ed5c1ef6a87bcb632cd65ef22b5435c566eb80ce7701ac7d62be1f41a5acf1ff2f24624bea5ca34f4b46f55708a09f40a4c167233f8399b0301c40401 SHA512 27a8fbb3be043cdd3cd27991cd5c9fa1c9c09b4c8c15abb2c48cbb079206af87bd6632c4dba7317af8fc971671043a666ff370ff8c06dfbd6cee73ab41026146 MISC metadata.xml 471 BLAKE2B e20584b628032072a966c48d91b644e4329e8677f4d0b7fbe94d1eab2ce5f7c29294ad6effc8615308a965322846b1b3406b6e20f1e81c00efc6a18fd5533a70 SHA512 73d7109871bd2bdec5736612c595aa00bd3fd910779727f06a2b70a86461b6a549400a9d5f7547f0cbf902805aebbded507327e1893585673378c162b8b18630 diff --git a/sys-cluster/pmix/pmix-4.2.2-r1.ebuild b/sys-cluster/pmix/pmix-4.2.2-r1.ebuild index 84966f965b68..b2382be92a0f 100644 --- a/sys-cluster/pmix/pmix-4.2.2-r1.ebuild +++ b/sys-cluster/pmix/pmix-4.2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,6 @@ DEPEND="${RDEPEND}" src_configure() { econf \ - --disable-werror \ $(use_enable debug) \ $(use_with munge) } diff --git a/sys-cluster/pmix/pmix-4.2.8.ebuild b/sys-cluster/pmix/pmix-4.2.8.ebuild index 9fb7d4f09632..55485e23b9ec 100644 --- a/sys-cluster/pmix/pmix-4.2.8.ebuild +++ b/sys-cluster/pmix/pmix-4.2.8.ebuild @@ -36,7 +36,6 @@ src_configure() { filter-lto econf \ - --disable-werror \ $(use_enable debug) \ $(use_with munge) } diff --git a/sys-cluster/pmix/pmix-5.0.2.ebuild b/sys-cluster/pmix/pmix-5.0.2.ebuild index ce44f08ba0c0..204dcf878bff 100644 --- a/sys-cluster/pmix/pmix-5.0.2.ebuild +++ b/sys-cluster/pmix/pmix-5.0.2.ebuild @@ -35,10 +35,17 @@ src_configure() { # https://github.com/openpmix/openpmix/issues/3350 filter-lto - econf \ - --disable-werror \ - $(use_enable debug) \ + local myeconfargs=( + # These are alternatives. We must use the one in DEPEND, and also + # prevent automagic fallbacks. + --with-libevent + --without-libev + + $(use_enable debug) $(use_with munge) + ) + + econf "${myeconfargs[@]}" } src_install() { |