mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-20 04:28:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

+ Fix x264 patch not applied after a clean

Browse source 
+ Fix libvpx and zrtp compilation for XCode 4.x

Overall, we transition from using gcc to using clang all the way. This solves some tricky problems with -mtune options and architecture-dependant configure issues.
This commit is contained in:
Guillaume BIENKOWSKI 2013-10-01 17:41:37 +02:00
parent ce17708a34
commit cc6074ad33
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
submodules/build/builders.d/libvpx.mk
View file

@ -41,7 +41,7 @@ clean-libvpx:
veryclean-libvpx:
-cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make distclean
cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \
&& git checkout build/make/configure.sh configure\
&& git clean -f && git reset --hard \
&& rm -f patched.stamp
rm -rf $(BUILDER_BUILD_DIR)/$(libvpx_dir)

6
submodules/build/builders.d/libvpx.patch
View file

@ -13,10 +13,10 @@ index c99a01c..f7f54c6 100755
- AS=${TOOLCHAIN_PATH}/as
- STRIP=${TOOLCHAIN_PATH}/strip
- NM=${TOOLCHAIN_PATH}/nm
+ CXX=`xcrun --find g++`
+ CC=`xcrun --find gcc`
+ CXX=`xcrun --find clang++`
+ CC=`xcrun --find clang`
+ AR=`xcrun --find ar`
+ LD=`xcrun --find ld`
+ LD=`xcrun --find clang`
+ AS=`xcrun --find as`
+ STRIP=`xcrun --find strip`
+ NM=`xcrun --find nm`

8
submodules/build/builders.d/x264.mk
View file

@ -44,7 +44,7 @@ $(BUILDER_SRC_DIR)/$(x264_dir)/patched:
&& git apply $(BUILDER_SRC_DIR)/build/builders.d/x264.patch \
&& touch $(BUILDER_SRC_DIR)/$(x264_dir)/patched
$(BUILDER_BUILD_DIR)/$(x264_dir)/configure:
$(BUILDER_BUILD_DIR)/$(x264_dir)/configure: $(BUILDER_SRC_DIR)/$(x264_dir)/patched
mkdir -p $(BUILDER_BUILD_DIR)/$(x264_dir)
cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \
&& rsync -rvLpgoc --exclude ".git" $(BUILDER_SRC_DIR)/$(x264_dir)/* .
@ -52,12 +52,12 @@ $(BUILDER_BUILD_DIR)/$(x264_dir)/configure:
$(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak: $(BUILDER_BUILD_DIR)/$(x264_dir)/configure
cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \
&& host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
&& CC="$$CC" ./configure --prefix=$(prefix) $(x264-configure-option)
&& CC="$$CC" STRINGS="$$STRINGS" ./configure --prefix=$(prefix) $(x264-configure-option)
build-x264: $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak
cd $(BUILDER_BUILD_DIR)/$(x264_dir) \
&& host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
&& make STRIP="$$STRIP" AR="$$AR -r " RANLIB="$$RANLIB" CC="$$CC" && make STRIP="$$STRIP" AR="$$AR" RANLIB="$$RANLIB" install
&& make STRIP="$$STRIP" AR="$$AR -r " RANLIB="$$RANLIB" CC="$$CC" STRINGS="$$STRINGS" && make STRIP="$$STRIP" AR="$$AR" RANLIB="$$RANLIB" STRINGS="$$STRINGS" install
clean-x264:
cd $(BUILDER_BUILD_DIR)/$(x264_dir) && make clean
@ -65,7 +65,7 @@ clean-x264:
veryclean-x264:
-cd $(BUILDER_BUILD_DIR)/$(x264_dir) && make distclean
cd $(BUILDER_SRC_DIR)/$(x264_dir)/ \
&& git checkout common/arm/asm.S \
&& git clean -f && git reset --hard \
&& rm -f patched
rm -rf $(BUILDER_BUILD_DIR)/$(x264_dir)

6
submodules/build/builders.d/zrtp.mk
View file

@ -4,7 +4,7 @@ $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile:
cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/\
&& host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
&& cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -Denable-ccrtp=false -DCMAKE_TOOLCHAIN_FILE=$(BUILDER_SRC_DIR)build/iphone-toolchain.cmake \
-LH -Wdev -DCMAKE_C_COMPILER=`xcrun --find gcc` -DCMAKE_CXX_COMPILER=`xcrun --find g++` \
-LH -Wdev -DCMAKE_C_COMPILER=`xcrun --find clang` -DCMAKE_CXX_COMPILER=`xcrun --find clang` \
-DCMAKE_SYSTEM_PROCESSOR=$$ARCH -DCMAKE_C_FLAGS="$$COMMON_FLAGS" -DCMAKE_CXX_FLAGS="$$COMMON_FLAGS" \
-DCMAKE_INSTALL_PREFIX=$(prefix) -DCMAKE_FIND_ROOT_PATH="$(prefix) -DBUILD_STATIC=ON "
# Used toolchain: $(TC)
@ -12,7 +12,9 @@ $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile:
build-zrtpcpp: $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile
@echo "Build ZRTP - prefix $(prefix)"
cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) && make VERBOSE=1 && make install
cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) \
&& host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
&& make VERBOSE=1 && make install
clean-zrtpcpp:
-cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) && make clean