From 672ea87bdc26e47c81052cecc9cfde9f4c7467a7 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 3 Feb 2018 11:33:49 +0100
Subject: [PATCH] Fix include paths for secondary x86

This helps python find libraries and dependencies properly (openssl,
etc), so a few more modules are enabled.

It also fixes a crash because python would try to load the gcc2 libroot
even when built with gcc5.
---
 Lib/ctypes/util.py | 1 +
 setup.py           | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index b2e4095..34e56aa 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -273,6 +273,7 @@ elif os.name == "posix":
                     directory = directory.replace('%A',
                         os.path.dirname(os.path.abspath(sys.argv[0] or os.getcwd())))
 
+                directory = os.path.join(directory, "x86")
                 if not os.path.isdir(directory):
                     continue
 
diff --git a/setup.py b/setup.py
index 704e7ec..f480cc9 100644
--- a/setup.py
+++ b/setup.py
@@ -696,8 +696,8 @@ class PyBuildExt(build_ext):
         # Haiku-specific library locations
         if HAIKU:
             self.inc_dirs += ['/boot/develop/headers/posix',
-                         '/boot/system/develop/headers']
-            self.lib_dirs += ['/boot/system/develop/lib']
+                         '/boot/system/develop/headers/x86']
+            self.lib_dirs += ['/boot/system/develop/lib/x86']
         # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
         if HOST_PLATFORM in ['osf1', 'unixware7', 'openunix8']:
             self.lib_dirs += ['/usr/ccs/lib']
-- 
2.23.0

