x32 build fix

diff --git a/python-pillow.spec b/python-pillow.spec
index a4eb88b2327bc30d842e11beaca439317e6a83f5..29d5d3da4079c4fac24bc298ab7d4fe1d3737053 100644 (file)
--- a/python-pillow.spec
+++ b/python-pillow.spec
@@ -19,6 +19,7 @@ License:      MIT
 Group:         Libraries/Python
 Source0:       https://github.com/python-pillow/Pillow/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: 75ce413c909a6755b8687ea2133a1aa1
+Patch0:                x32.patch
 URL:           http://python-pillow.github.io/
 BuildRequires: freetype-devel
 BuildRequires: ghostscript
@@ -213,6 +214,10 @@ PIL image wrapper for Qt.
 %prep
 %setup -q -n Pillow-%{version}
 
+%if "%{_lib}" == "libx32"
+%patch0 -p1
+%endif
+
 # Strip shebang on non-executable file
 sed -i 1d PIL/OleFileIO.py
 

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..2f81c38
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,12 @@
+diff -dur Pillow-3.1.1.orig/setup.py Pillow-3.1.1/setup.py
+--- Pillow-3.1.1.orig/setup.py 2016-02-04 17:17:58.000000000 +0100
++++ Pillow-3.1.1/setup.py      2016-03-09 13:33:32.833222025 +0100
+@@ -194,6 +194,8 @@
+ 
+         #
+         # add platform directories
++        _add_directory(library_dirs, "/libx32")
++        _add_directory(library_dirs, "/usr/libx32")
+ 
+         if sys.platform == "cygwin":
+             # pythonX.Y.dll.a is in the /usr/lib/pythonX.Y/config directory