ios: various fix for contrib

- disable assembler for nettle
- disable assembler for opus
- use the configure-iphone of pjproject
- disable neon in speexdsp (not compatible with arm64/aarch64)

Change-Id: I29872c9edeccfe413d7dce6d5c0f3f9fa76db6e1
Tuleap: #313

contrib/src/nettle/rules.mak

@@ -20,6 +20,10 @@ nettle: nettle-$(NETTLE_VERSION).tar.gz .sum-nettle
 DEPS_nettle = gmp $(DEPS_gmp)
 
 .nettle: nettle
+ifdef HAVE_IOS
+	cd $< && $(HOSTVARS) ./configure --disable-assembler $(HOSTCONF)
+else
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+endif
 	cd $< && $(MAKE) install
 	touch $@

contrib/src/opus/rules.mak

@@ -25,6 +25,10 @@ ifndef HAVE_FPU
 OPUS_CONF += --enable-fixed-point
 endif
 
+ifdef HAVE_IOS
+OPUS_CONF += --disable-asm
+endif
+
 .opus: opus
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(OPUS_CONF)
 	cd $< && $(MAKE) install

contrib/src/pjproject/rules.mak

@@ -68,6 +68,10 @@ endif
 	$(MOVE)
 
 .pjproject: pjproject
+ifdef HAVE_IOS
+	cd $< && ARCH="-arch $(ARCH)" IPHONESDK=$(IOS_SDK) $(HOSTVARS) ./configure-iphone $(HOSTCONF) $(PJPROJECT_OPTIONS)
+else
 	cd $< && $(HOSTVARS) ./aconfigure $(HOSTCONF) $(PJPROJECT_OPTIONS)
+endif
 	cd $< && CFLAGS="$(PJPROJECT_EXTRA_CFLAGS)" $(MAKE) && $(MAKE) install
 	touch $@

contrib/src/speexdsp/rules.mak

@@ -27,6 +27,10 @@ ifeq ($(ARCH),aarch64)
 # old neon, not compatible with aarch64
 SPEEXDSP_CONF += --disable-neon
 endif
+ifeq ($(ARCH),arm64)
+# old neon, not compatible with arm64(==aarch64)
+SPEEXDSP_CONF += --disable-neon
+endif
 ifndef HAVE_NEON
 SPEEXDSP_CONF += --disable-neon
 endif