From 982a886d6e551e6988395353240d253f2899fb89 Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Thu, 6 Mar 2025 15:55:13 -0700
Subject: [PATCH] Revert "python: Use more generic march for rosetta
 compatibiity (#44644)" (#44950)

pyperformance on a gcloud VM noticed some seemingly significant
regressions due to this. Let's roll it back until we can properly assess
how to proceed.

This reverts commit 0d66ee5bf0c07f6ad26ce8c4244fb7c6ca6cb83c.

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 python-3.10.yaml | 18 +-----------------
 python-3.11.yaml | 17 +----------------
 python-3.12.yaml | 17 +----------------
 python-3.13.yaml | 17 +----------------
 4 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/python-3.10.yaml b/python-3.10.yaml
index 36b06de5482..41981c414f6 100644
--- a/python-3.10.yaml
+++ b/python-3.10.yaml
@@ -1,7 +1,7 @@
 package:
   name: python-3.10
   version: 3.10.16
-  epoch: 2
+  epoch: 3
   description: "the Python programming language"
   copyright:
     - license: PSF-2.0
@@ -61,22 +61,6 @@ 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 --git a/python-3.11.yaml b/python-3.11.yaml
index d5d4b6a96e8..d761752b5c5 100644
--- a/python-3.11.yaml
+++ b/python-3.11.yaml
@@ -1,7 +1,7 @@
 package:
   name: python-3.11
   version: 3.11.11
-  epoch: 2
+  epoch: 3
   description: "the Python programming language"
   copyright:
     - license: PSF-2.0
@@ -61,21 +61,6 @@ 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 --git a/python-3.12.yaml b/python-3.12.yaml
index f379261106b..091d4107d1d 100644
--- a/python-3.12.yaml
+++ b/python-3.12.yaml
@@ -1,7 +1,7 @@
 package:
   name: python-3.12
   version: "3.12.9"
-  epoch: 3
+  epoch: 4
   description: "the Python programming language"
   copyright:
     - license: PSF-2.0
@@ -68,21 +68,6 @@ 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 --git a/python-3.13.yaml b/python-3.13.yaml
index 3da6b84f9cb..3c641e83739 100644
--- a/python-3.13.yaml
+++ b/python-3.13.yaml
@@ -1,7 +1,7 @@
 package:
   name: python-3.13
   version: "3.13.2"
-  epoch: 3
+  epoch: 4
   description: "the Python programming language"
   copyright:
     - license: PSF-2.0
@@ -68,21 +68,6 @@ 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}} \