From 07d4f095a9e22ae676a8d68073101131e65012dc Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Tue, 15 Nov 2011 13:16:54 +0100
Subject: [PATCH] python imaging setup.py: force paths for zlib, freetype and jpeg and don't add host paths

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

Upstream-Status: Inappropriate [embedded specific]
---
 setup.py |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/setup.py b/setup.py
index 5d4d53a..b1a22ec 100644
--- a/setup.py
+++ b/setup.py
@@ -34,10 +34,10 @@ def libinclude(root):
 # TIFF_ROOT = libinclude("/opt/tiff")
 
 TCL_ROOT = None
-JPEG_ROOT = None
-ZLIB_ROOT = None
+JPEG_ROOT = os.environ['STAGING_LIBDIR']
+ZLIB_ROOT = os.environ['STAGING_LIBDIR']
 TIFF_ROOT = None
-FREETYPE_ROOT = None
+FREETYPE_ROOT =  os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
 LCMS_ROOT = None
 
 # FIXME: add mechanism to explicitly *disable* the use of a library
@@ -147,7 +147,6 @@ class pil_build_ext(build_ext):
             add_directory(library_dirs, "/opt/local/lib")
             add_directory(include_dirs, "/opt/local/include")
 
-        add_directory(library_dirs, "/usr/local/lib")
         # FIXME: check /opt/stuff directories here?
 
         prefix = sysconfig.get_config_var("prefix")
@@ -207,13 +206,6 @@ class pil_build_ext(build_ext):
             if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
                 add_directory(include_dirs, tcl_dir)
 
-        # standard locations
-        add_directory(library_dirs, "/usr/local/lib")
-        add_directory(include_dirs, "/usr/local/include")
-
-        add_directory(library_dirs, "/usr/lib")
-        add_directory(include_dirs, "/usr/include")
-
         #
         # insert new dirs *before* default libs, to avoid conflicts
         # between Python PYD stub libs and real libraries
-- 
1.7.2.5