COMP: Fix manylinux scripts using portable "uname -m" command

The use of "uname -p" returns "unknown" when used within the 2_24 image.

Author: jcfr

scripts/internal/manylinux-build-common.sh

@@ -28,7 +28,7 @@ else
 fi
 
 # i686 or x86_64 ?
-case $(uname -p) in
+case $(uname -m) in
     i686)
         ARCH=x86
         ;;
@@ -39,13 +39,13 @@ case $(uname -p) in
         ARCH=aarch64
         ;;
     *)
-        die "Unknown architecture $(uname -p)"
+        die "Unknown architecture $(uname -m)"
         ;;
 esac
 
 # Install prerequirements
 export PATH=/work/tools/doxygen-1.8.11/bin:$PATH
-case $(uname -p) in
+case $(uname -m) in
     i686)
         ARCH=x86
         ;;
@@ -69,7 +69,7 @@ case $(uname -p) in
         fi
         ;;
     *)
-        die "Unknown architecture $(uname -p)"
+        die "Unknown architecture $(uname -m)"
         ;;
 esac
 if ! type ninja > /dev/null 2>&1; then

scripts/internal/manylinux-build-module-wheels.sh

@@ -95,7 +95,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
       -DITK_USE_SYSTEM_SWIG:BOOL=ON \
       -DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
       -DSWIG_EXECUTABLE:FILEPATH=${itk_build_dir}/Wrapping/Generators/SwigInterface/swig/bin/swig \
-      -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -p)-linux-gnu \
+      -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -m)-linux-gnu \
       -DBUILD_TESTING:BOOL=OFF \
       -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
       -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
@@ -108,7 +108,7 @@ if test "${ARCH}" == "x64"; then
   # Make sure auditwheel is installed for this python exe before importing
   # it in auditwheel_whitelist_monkeypatch.py
   sudo ${Python3_EXECUTABLE} -m pip install auditwheel
-  for whl in dist/*linux_$(uname -p).whl; do
+  for whl in dist/*linux_$(uname -m).whl; do
     # Repair wheel using monkey patch to exclude shared libraries provided in whitelist
     ${Python3_EXECUTABLE} "${script_dir}/auditwheel_whitelist_monkeypatch.py" \
       repair ${whl} -w /work/dist/ --whitelist "${EXCLUDE_LIBS}"

scripts/internal/manylinux-build-wheels.sh

@@ -81,7 +81,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
             -DITK_WRAP_double:BOOL=ON \
             -DITK_WRAP_complex_double:BOOL=ON \
             -DITK_WRAP_IMAGE_DIMS:STRING="2;3;4" \
-            -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -p)-linux-gnu \
+            -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -m)-linux-gnu \
             -DCMAKE_CXX_FLAGS:STRING="$compile_flags" \
             -DCMAKE_C_FLAGS:STRING="$compile_flags" \
             -DCMAKE_BUILD_TYPE:STRING="${build_type}" \
@@ -110,7 +110,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
           -DBUILD_TESTING:BOOL=OFF \
           -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
           -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
-          -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -p)-linux-gnu \
+          -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -m)-linux-gnu \
           -DCMAKE_CXX_FLAGS:STRING="$compile_flags" \
           -DCMAKE_C_FLAGS:STRING="$compile_flags" \
           -DCMAKE_BUILD_TYPE:STRING="${build_type}" \
@@ -168,12 +168,12 @@ done
 if test "${ARCH}" == "x64"; then
   sudo /opt/python/cp39-cp39/bin/pip3 install auditwheel wheel
   # This step will fixup the wheel switching from 'linux' to 'manylinux<version>' tag
-  for whl in dist/itk_*linux_$(uname -p).whl; do
+  for whl in dist/itk_*linux_$(uname -m).whl; do
       /opt/python/cp39-cp39/bin/auditwheel repair --plat manylinux${MANYLINUX_VERSION}_x86_64 ${whl} -w /work/dist/
       rm ${whl}
   done
 else
-  for whl in dist/itk_*$(uname -p).whl; do
+  for whl in dist/itk_*$(uname -m).whl; do
       auditwheel repair ${whl} -w /work/dist/
       rm ${whl}
   done