From 34f2793b521158bb817cabbcf77a1977fbf06255 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mar 13 2020 15:15:43 +0000 Subject: Use __isa_bits instead of crafted value This is easier to read and the appropriate macro to use here Signed-off-by: Nicolas Chauvet --- diff --git a/python3.spec b/python3.spec index f510c3c..a6aaa96 100644 --- a/python3.spec +++ b/python3.spec @@ -132,16 +132,6 @@ License: Python # Tracked at https://bugzilla.redhat.com/show_bug.cgi?id=1724753 %global source_date_epoch_from_changelog 0 -# For multilib support, files that are different between 32- and 64-bit arches -# need different filenames. Use "64" or "32" according to the word size. -# Currently, the best way to determine an architecture's word size happens to -# be checking %%{_lib}. -%if "%{_lib}" == "lib64" -%global wordsize 64 -%else -%global wordsize 32 -%endif - # ======================= # Build-time requirements @@ -744,7 +734,7 @@ mkdir -p %{buildroot}$DirHoldingGdbPy # Filanames are defined here: %global _pyconfig32_h pyconfig-32.h %global _pyconfig64_h pyconfig-64.h -%global _pyconfig_h pyconfig-%{wordsize}.h +%global _pyconfig_h pyconfig-%{__isa_bits}.h # Use a common function to do an install for all our configurations: InstallPython() {