We now require a specific version of libffi on iOS.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 01a0f0eb7d8fd46170641b687d45e55874d18ea3..c1f81b5ce6bb1995d2233b4f2c89175e28baa6fc 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -138,7 +138,7 @@ control.tmp: control.in .libs/cycript .libs/$(lib)cycript.so
        $(sed) -e 's/&/'"$$(dpkg-query -S $$(ldd cycript $(lib)cycript.so | $(sed) -e '/:$$/ d; s/^[ \t]*\([^ ]* => \)\?\([^ ]*\) .*/\2/' | sort -u) 2>/dev/null | $(sed) -e 's/:.*//; /^cycript$$/ d; s/$$/,/' | sort -u | tr '\n' ' ')"'/;s/, $$//;s/#/$(version)/;s/%/$(arch)/' $< >$@
 else
 control.tmp: control.in
        $(sed) -e 's/&/'"$$(dpkg-query -S $$(ldd cycript $(lib)cycript.so | $(sed) -e '/:$$/ d; s/^[ \t]*\([^ ]* => \)\?\([^ ]*\) .*/\2/' | sort -u) 2>/dev/null | $(sed) -e 's/:.*//; /^cycript$$/ d; s/$$/,/' | sort -u | tr '\n' ' ')"'/;s/, $$//;s/#/$(version)/;s/%/$(arch)/' $< >$@
 else
 control.tmp: control.in

-       $(sed) -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(version)/;s/%/$(arch)/' $< >$@
+       $(sed) -e 's/&/$(depends)/;s/,$$//;s/#/$(version)/;s/%/$(arch)/' $< >$@

 endif
 endif
 
 endif
 endif
 

diff --git a/ios.sh b/ios.sh
index 96ea47acecd1b4ec42e83ec3c68aecf0591cef23..3b43991fa4f433a99fcf8431d44efb0baa449ed2 100755 (executable)
--- a/ios.sh
+++ b/ios.sh
@@ -64,4 +64,4 @@ export LTFLAGS=${lflags}
 
 make clean
 make -j ldid=ldid all
 
 make clean
 make -j ldid=ldid all

-PATH=/sw/bin:$PATH make arch=iphoneos-arm version=432 dll=dylib depends='apr-lib readline libffi mobilesubstrate' package
+PATH=/sw/bin:$PATH make arch=iphoneos-arm version=432 dll=dylib depends='apr-lib, readline, libffi (>= 1:3.0.10-5), mobilesubstrate' package