From: DongHun Kwak <dh0128.kwak@samsung.com>
Date: Wed, 14 Aug 2019 07:01:07 +0000 (+0900)
Subject: Fix build error at 64bit env
X-Git-Tag: submit/tizen_base/20190814.074002~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4eb7812c8a64b8eb851bf99ece7f153bbc363eb1;p=platform%2Fupstream%2Fpython3.git

Fix build error at 64bit env

Change-Id: I8c347a708ff924ff925831dc3d9a3c54f5427ba2
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
---

diff --git a/packaging/python-3.7.3_lib64.patch b/packaging/python-3.7.3_lib64.patch
index cd030f2d..8d9f64c5 100644
--- a/packaging/python-3.7.3_lib64.patch
+++ b/packaging/python-3.7.3_lib64.patch
@@ -20,20 +20,15 @@ index 0258d3d..4b969bf 100644
          'scripts': '$base/bin',
          'data'   : '$base',
 diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 83160f8..7aef07c 100644
+index 83160f8..dd65ca1 100644
 --- a/Lib/distutils/sysconfig.py
 +++ b/Lib/distutils/sysconfig.py
-@@ -142,8 +142,11 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
-             prefix = plat_specific and EXEC_PREFIX or PREFIX
+@@ -143,7 +143,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
  
      if os.name == "posix":
--        libpython = os.path.join(prefix,
+         libpython = os.path.join(prefix,
 -                                 "lib", "python" + get_python_version())
-+        if plat_specific or standard_lib:
-+            lib = "lib64"
-+        else:
-+            lib = "lib"
-+        libpython = os.path.join(prefix, lib, "python" + get_python_version())
++                                 "lib64", "python" + get_python_version())
          if standard_lib:
              return libpython
          else:
@@ -57,6 +52,19 @@ index ad11463..f4563fe 100644
              sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
      return sitepackages
  
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index d15cec8..956a03a 100644
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -23,7 +23,7 @@ _INSTALL_SCHEMES = {
+         'stdlib': '{installed_base}/lib/python{py_version_short}',
+         'platstdlib': '{platbase}/lib/python{py_version_short}',
+         'purelib': '{base}/lib/python{py_version_short}/site-packages',
+-        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
++        'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
+         'include':
+             '{installed_base}/include/python{py_version_short}{abiflags}',
+         'platinclude':
 diff --git a/Modules/getpath.c b/Modules/getpath.c
 index 67ceb87..a5b32ae 100644
 --- a/Modules/getpath.c
diff --git a/packaging/python3.spec b/packaging/python3.spec
index 4c435110..3fa2e00c 100644
--- a/packaging/python3.spec
+++ b/packaging/python3.spec
@@ -220,7 +220,7 @@ make -t Python/Python-ast.c \
 
 ### COMMON-CONFIG-END ###
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} BASE_LIB=%{_lib}
 
 %check
 ## Limit virtual memory to avoid spurious failures