mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'build-ssl' into tunnel

Browse source 
Conflicts:
	submodules/build/builder-iphone-os.mk
This commit is contained in:
Jehan Monnier 2011-03-19 17:56:33 +01:00
commit d353f79527
4 changed files with 51 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
submodules/build/builder-iphone-os.mk
View file

@ -73,12 +73,14 @@ all: build-linphone build-msilbc
clean-makefile: clean-makefile-linphone
clean: clean-linphone
init:
mkdir -p $(prefix)/include
mkdir -p $(prefix)/lib
veryclean:
rm -rf $(BUILDER_BUILD_DIR)
build-linphone: build-osip2 build-eXosip2 build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile
build-linphone: init build-openssl build-osip2 build-eXosip2 build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile
cd $(LINPHONE_BUILD_DIR) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install
clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-msilbc clean-libilbc
@ -254,10 +256,6 @@ clean-makefile-libilbc:
cd $(LIBILBC_BUILD_DIR) && rm -f Makefile
#openssl
$(prefix)/include/openssl/ssl.h:
cd $(prefix) \
&& unzip $(BUILDER_SRC_DIR)/prebuilt/$(OPENSSL_ZIP)
#include extensions
include builders.d/*.mk

35
submodules/build/builders.d/openssl.mk Normal file
View file

@ -0,0 +1,35 @@
openssl_version=1.0.0a
OPENSSL_BUILD_DIR?=$(BUILDER_BUILD_DIR)/externals/openssl
ifneq (,$(findstring mingw,$(host)))
CONFIGURE_OPTION := mingw
MAKE_PARAMS:= CC=i586-mingw32msvc-gcc RANLIB=i586-mingw32msvc-ranlib
endif
$(OPENSSL_BUILD_DIR)/Configure:
mkdir -p $(BUILDER_BUILD_DIR)/externals \
&& cd $(BUILDER_BUILD_DIR)/externals \
&& rm -rf openssl \
&& wget ftp://sunsite.cnlab-switch.ch/mirror/openssl/source/openssl-$(openssl_version).tar.gz \
&& tar xvzf openssl-$(openssl_version).tar.gz \
&& rm -f openssl-$(openssl_version).tar.gz \
&& mv openssl-$(openssl_version) openssl \
&& cd openssl && patch -p0 < $(BUILDER_SRC_DIR)/build/openssl.patch
$(OPENSSL_BUILD_DIR)/Makefile: $(OPENSSL_BUILD_DIR)/Configure
cd $(OPENSSL_BUILD_DIR) \
&& host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \
&& ./Configure -openssldir=$(prefix) --cross-compile-prefix=$$SDK_BIN_PATH/ BSD-generic32 no-asm
build-openssl: $(OPENSSL_BUILD_DIR)/Makefile
cd $(OPENSSL_BUILD_DIR) && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \
&& make CC="$$CC" build_crypto build_ssl \
&& cp -r include $(prefix)/ \
&& cp lib*.a $(prefix)/lib
clean-openssl:
cd $(OPENSSL_BUILD_DIR) && make clean
veryclean-openssl:
rm -rf $(OPENSSL_BUILD_DIR)

11
submodules/build/openssl.patch Normal file
View file

@ -0,0 +1,11 @@
--- crypto/ui/ui_openssl.c.ori 2011-03-18 18:09:26.000000000 +0100
+++ crypto/ui/ui_openssl.c 2011-03-18 18:09:44.000000000 +0100
@@ -404,7 +404,7 @@
return 1;
}
-static volatile sig_atomic_t intr_signal;
+static volatile int intr_signal;
#endif
static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)

2
submodules/externals/exosip vendored

@ -1 +1 @@
Subproject commit 1262115554eff2f900ff20ac992e47272017f429
Subproject commit 3e726cfa1042805942fd951c503df42af1546062