diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 65dcdfce4..924131e5b 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -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,9 +256,10 @@ 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 builders.d/openssl.mk +#$(prefix)/include/openssl/ssl.h: +# cd $(prefix) \ +# && unzip $(BUILDER_SRC_DIR)/prebuilt/$(OPENSSL_ZIP) #sdk generation and distribution diff --git a/submodules/build/builders.d/openssl.mk b/submodules/build/builders.d/openssl.mk new file mode 100644 index 000000000..101ee8be9 --- /dev/null +++ b/submodules/build/builders.d/openssl.mk @@ -0,0 +1,34 @@ +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) \ + ./Configure -openssldir=$(prefix) 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_libs \ + && cp -r include $(prefix)/ \ + && cp lib*.a $(prefix)/lib + +clean-openssl: + cd $(OPENSSL_BUILD_DIR) && make clean + +veryclean-openssl: + rm -rf $(OPENSSL_BUILD_DIR) +