#170 Use __isa_bits instead of crafted value
Merged 4 years ago by churchyard. Opened 4 years ago by kwizart.
rpms/ kwizart/python3 isa_bits_fix  into  master

file modified
+1 -11
@@ -144,16 +144,6 @@ 

  # on files that test invalid syntax.

  %undefine py_auto_byte_compile

  

- # 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
@@ -787,7 +777,7 @@ 

  # 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() {

This is easier to read and the appropriate macro to use here

Signed-off-by: Nicolas Chauvet kwizart@gmail.com

This is the same commit from python37 rebased on top on python3
See also https://src.fedoraproject.org/rpms/python37/pull-request/41

Metadata Update from @churchyard:
- Pull-request tagged with: merge - rebase - CI

4 years ago

To be merged when the CI is green.

Build succeeded.

rebased onto 086f5b2

4 years ago

Pull-Request has been merged by churchyard

4 years ago

Build succeeded.