Browse Source

Another MOD build fix

Signed-off-by: falkTX <falktx@falktx.com>
pull/28/head
falkTX 1 year ago
parent
commit
e06cf97b27
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 28 additions and 0 deletions
  1. +7
    -0
      bootstrap-mod.sh
  2. +21
    -0
      patches/Pillow/01_fix-build.patch

+ 7
- 0
bootstrap-mod.sh View File

@@ -36,6 +36,12 @@ source setup/versions.sh
# ---------------------------------------------------------------------------------------------------------------------
# merged usr mode

mkdir -p "${PAWPAW_PREFIX}/bin"
mkdir -p "${PAWPAW_PREFIX}/docs"
mkdir -p "${PAWPAW_PREFIX}/etc"
mkdir -p "${PAWPAW_PREFIX}/include"
mkdir -p "${PAWPAW_PREFIX}/lib"
mkdir -p "${PAWPAW_PREFIX}/share"
mkdir -p "${PAWPAW_PREFIX}/usr"

if [ ! -e "${PAWPAW_PREFIX}/usr/bin" ]; then
@@ -60,6 +66,7 @@ fi
# ---------------------------------------------------------------------------------------------------------------------
# merged usr mode (host)

mkdir -p "${PAWPAW_PREFIX}-host/bin"
mkdir -p "${PAWPAW_PREFIX}-host/usr"

if [ ! -e "${PAWPAW_PREFIX}-host/usr/bin" ]; then


+ 21
- 0
patches/Pillow/01_fix-build.patch View File

@@ -36,3 +36,24 @@ index 60426d4..2a922ea 100755
vendor = set()
def __init__(self):
diff --git a/setup.py b/setup.py
index 60426d4..0596287 100755
--- a/setup.py
+++ b/setup.py
@@ -572,16 +572,6 @@ class pil_build_ext(build_ext):
# FIXME: check /opt/stuff directories here?
- # standard locations
- if not self.disable_platform_guessing:
- _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")
- # alpine, at least
- _add_directory(library_dirs, "/lib")
-
if sys.platform == "win32":
# on Windows, look for the OpenJPEG libraries in the location that
# the official installer puts them

Loading…
Cancel
Save