gentoo auto-resync : 06:07:2024 - 08:06:15

3 files changed, 187 insertions, 1 deletions

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