modified: src/jpeg_files/jpeg_makefile.patch

modified:   src/pil_files/patch_pil.patch
	modified:   tools/build-libjpeg.sh
This commit is contained in:
Toni Bagur 2013-07-12 15:11:30 +02:00
parent 443cce7076
commit 02278679df
3 changed files with 5 additions and 4 deletions

View file

@ -1,5 +1,5 @@
--- Makefile 2013-07-12 14:23:38.000000000 +0200 --- Makefile_old 2013-07-12 14:23:38.000000000 +0200
+++ Makefile_new 2013-07-12 14:26:34.000000000 +0200 +++ Makefile 2013-07-12 14:26:34.000000000 +0200
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
LDLIBS= LDLIBS=

View file

@ -79,7 +79,7 @@ diff -rupN Imaging-1.1.7/setup.py Imaging-1.1.7_patched/setup.py
+ tiff = tcl = tk = lcms = None + tiff = tcl = tk = lcms = None
+ jpeg="jpeg" + jpeg="jpeg"
+ zlib="zlib" + zlib="zlib"
+ freetype="freetype" + freetype="freetype";freetype_version=21
+ feature = feature() + feature = feature()
+ +
files = ["_imaging.c"] files = ["_imaging.c"]

View file

@ -16,12 +16,13 @@ fi
# lib not found, compile it # lib not found, compile it
echo "Configuring...." echo "Configuring...."
pushd $TMPROOT/jpeg-6b pushd $TMPROOT/jpeg-6b
echo try ./configure --prefix=$DESTROOT \ try ./configure --prefix=$DESTROOT \
--host=arm-apple-darwin \ --host=arm-apple-darwin \
--enable-static=yes \ --enable-static=yes \
--enable-shared=no \ --enable-shared=no \
CC="$ARM_CC" AR="$ARM_AR" \ CC="$ARM_CC" AR="$ARM_AR" \
LDFLAGS="$ARM_LDFLAGS" CFLAGS="$ARM_CFLAGS" LDFLAGS="$ARM_LDFLAGS" CFLAGS="$ARM_CFLAGS"
patch < $KIVYIOSROOT/src/jpeg_files/jpeg_makefile.patch
try make clean try make clean
make #With controlled errors make #With controlled errors