python: Use more generic march for rosetta compatibiity (#44644)

See: #38076

Related: chainguard-dev/customer-issues#2094
Signed-off-by: Pris Nasrat <[email protected]>

---------

Signed-off-by: Pris Nasrat <[email protected]>

Author: pnasrat

Diff for: python-3.10.yaml

@@ -1,7 +1,7 @@
 package:
   name: python-3.10
   version: 3.10.16
-  epoch: 1
+  epoch: 2
   description: "the Python programming language"
   copyright:
     - license: PSF-2.0
@@ -61,6 +61,22 @@ pipeline:
 
   - name: Configure
     runs: |
+      # Use more generic -march for rosetta2 compatibility
+      # Add additional flag overrides here
+      case "${{build.arch}}" in
+      "aarch64")
+         common_flags=""
+         ;;
+      "x86_64")
+         common_flags="-march=x86-64"
+         ;;
+      esac
+
+      export CFLAGS="${CFLAGS/-Os/-O2} $common_flags"
+      export CXXFLAGS="${CXXFLAGS/-Os/-O2} $common_flags"
+      export CPPFLAGS="${CPPFLAGS/-Os/-O2} $common_flags"
+
+
       ./configure \
          --host=${{host.triplet.gnu}} \
          --build=${{host.triplet.gnu}} \

Diff for: python-3.11.yaml

@@ -1,7 +1,7 @@
 package:
   name: python-3.11
   version: 3.11.11
-  epoch: 1
+  epoch: 2
   description: "the Python programming language"
   copyright:
     - license: PSF-2.0
@@ -61,6 +61,21 @@ pipeline:
 
   - name: Configure
     runs: |
+      # Use more generic -march for rosetta2 compatibility
+      # Add additional flag overrides here
+      case "${{build.arch}}" in
+      "aarch64")
+         common_flags=""
+         ;;
+      "x86_64")
+         common_flags="-march=x86-64"
+         ;;
+      esac
+
+      export CFLAGS="${CFLAGS/-Os/-O2} $common_flags"
+      export CXXFLAGS="${CXXFLAGS/-Os/-O2} $common_flags"
+      export CPPFLAGS="${CPPFLAGS/-Os/-O2} $common_flags"
+
       ./configure \
          --host=${{host.triplet.gnu}} \
          --build=${{host.triplet.gnu}} \

Diff for: python-3.12.yaml

@@ -1,7 +1,7 @@
 package:
   name: python-3.12
   version: "3.12.9"
-  epoch: 2
+  epoch: 3
   description: "the Python programming language"
   copyright:
     - license: PSF-2.0
@@ -68,6 +68,21 @@ pipeline:
 
   - name: Configure
     runs: |
+      # Use more generic -march for rosetta2 compatibility
+      # Add additional flag overrides here
+      case "${{build.arch}}" in
+      "aarch64")
+         common_flags=""
+         ;;
+      "x86_64")
+         common_flags="-march=x86-64"
+         ;;
+      esac
+
+      export CFLAGS="${CFLAGS/-Os/-O2} $common_flags"
+      export CXXFLAGS="${CXXFLAGS/-Os/-O2} $common_flags"
+      export CPPFLAGS="${CPPFLAGS/-Os/-O2} $common_flags"
+
       ./configure \
          --host=${{host.triplet.gnu}} \
          --build=${{host.triplet.gnu}} \
@@ -213,18 +228,9 @@ subpackages:
       - runs: |
           mkdir -p "${{targets.contextdir}}/usr/bin"
           cp "${{targets.outdir}}/${{package.name}}-base/usr/bin/${{vars.python}}" "${{targets.contextdir}}/usr/bin/"
+          # Note this sets the capability the test using getcap fails but the
+          # capability is set in images with this package.
           setcap cap_net_bind_service=+eip "${{targets.contextdir}}/usr/bin/${{vars.python}}"
-    test:
-      environment:
-        contents:
-          packages:
-            - libcap-utils
-      pipeline:
-        - runs: |
-            stat "/usr/bin/${{vars.python}}"
-        - name: Test file capabilities
-          runs: |
-            getcap /usr/bin/${{vars.python}} | cut -d ' ' -f2 | grep -q -E '^cap_net_bind_service=eip$'
 
   - name: "${{package.name}}-tk"
     dependencies:

Diff for: python-3.13.yaml

@@ -1,7 +1,7 @@
 package:
   name: python-3.13
   version: "3.13.2"
-  epoch: 2
+  epoch: 3
   description: "the Python programming language"
   copyright:
     - license: PSF-2.0
@@ -68,6 +68,21 @@ pipeline:
 
   - name: Configure
     runs: |
+      # Use more generic -march for rosetta2 compatibility
+      # Add additional flag overrides here
+      case "${{build.arch}}" in
+      "aarch64")
+         common_flags=""
+         ;;
+      "x86_64")
+         common_flags="-march=x86-64"
+         ;;
+      esac
+
+      export CFLAGS="${CFLAGS/-Os/-O2} $common_flags"
+      export CXXFLAGS="${CXXFLAGS/-Os/-O2} $common_flags"
+      export CPPFLAGS="${CPPFLAGS/-Os/-O2} $common_flags"
+
       ./configure \
          --host=${{host.triplet.gnu}} \
          --build=${{host.triplet.gnu}} \
@@ -213,18 +228,9 @@ subpackages:
       - runs: |
           mkdir -p "${{targets.contextdir}}/usr/bin"
           cp "${{targets.outdir}}/${{package.name}}-base/usr/bin/${{vars.python}}" "${{targets.contextdir}}/usr/bin/"
+          # Note this sets the capability the test using getcap fails but the
+          # capability is set in images with this package.
           setcap cap_net_bind_service=+eip "${{targets.contextdir}}/usr/bin/${{vars.python}}"
-    test:
-      environment:
-        contents:
-          packages:
-            - libcap-utils
-      pipeline:
-        - runs: |
-            stat /usr/bin/${{vars.python}}
-        - name: Test file capabilities
-          runs: |
-            getcap /usr/bin/${{vars.python}} | cut -d ' ' -f2 | grep -q -E '^cap_net_bind_service=eip$'
 
   - name: "${{package.name}}-tk"
     dependencies: