From 286efef8aeb4221069c606e80547aa816e00804a Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 20 Sep 2012 18:12:52 +0200 Subject: [PATCH] remove armv6 build --- README | 10 ++++----- submodules/build/Makefile | 22 +++++++++---------- .../{Makefile.ios6-beta => Makefile.xcode4.4} | 22 +++++++++---------- submodules/build/builder-iphone-os.mk | 2 +- submodules/build/builders.d/libvpx.mk | 3 +++ 5 files changed, 30 insertions(+), 29 deletions(-) rename submodules/build/{Makefile.ios6-beta => Makefile.xcode4.4} (76%) diff --git a/README b/README index 37bb0e4c4..5271e31cf 100644 --- a/README +++ b/README @@ -10,9 +10,9 @@ You must first install both xcode with iPhone OS SDK and MacPorts (www.macports. Make sure that /opt/local/bin (macport tools) arrives first in your PATH env variable, so that the macport tools are taken in place of the versions brought by Apple in /usr/bin. Otherwise the build will fail with obscure errors. -Once xccode and macports are installed, open a terminal and install the required build-time tools with: +Once xcode and macports are installed, open a terminal and install the required build-time tools with: - $ sudo port install coreutils automake autoconf libtool intltool wget pkgconfig cmake gmake yasm grep doxygen + $ sudo port install coreutils automake autoconf libtool intltool wget pkgconfig cmake gmake yasm grep doxygen ImageMagick optipng Install gas-preprosessor.pl (http://github.com/yuvi/gas-preprocessor/ ) to be copied into /opt/local/bin : @@ -32,8 +32,6 @@ Link host's strings to simulator SDK For newer XCode: $ sudo ln -s /usr/bin/strings /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/strings -ImageMagick & Optipng - sudo port install ImageMagick optipng BUILDING THE SDK **************** @@ -54,8 +52,8 @@ BUILDING THE SDK $ cd submodules/build $ make all enable_gpl_third_parties=no -xcode 4.5i/ios6 beta do: - $ make -f Makefile.ios6-beta +xcode prior to 4.5: + $ make -f Makefile.xcode4.4 * ZRTP support You can enable ZRTP support in GPL mode only, by adding "enable_zrtp=yes" to the make command, for example: diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 276688bb4..bb1fd7a6c 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -54,28 +54,28 @@ endif LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) build: - make -f builder-iphone-os.mk host=armv6-apple-darwin $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \ + make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk delivery-sdk ipa: build make -f builder-iphone-simulator.mk ipa \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin ipa \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin ipa + && make -f builder-iphone-os.mk ipa \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin ipa \ clean: make -f builder-iphone-simulator.mk clean \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin clean \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin clean + && make -f builder-iphone-os.mk clean \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean \ clean-makefile: make -f builder-iphone-simulator.mk clean-makefile \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin clean-makefile \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile + && make -f builder-iphone-os.mk clean-makefile \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean-makefile \ veryclean: make -f builder-iphone-simulator.mk veryclean \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin veryclean \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean + && make -f builder-iphone-os.mk veryclean \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin veryclean \ diff --git a/submodules/build/Makefile.ios6-beta b/submodules/build/Makefile.xcode4.4 similarity index 76% rename from submodules/build/Makefile.ios6-beta rename to submodules/build/Makefile.xcode4.4 index bb1fd7a6c..276688bb4 100644 --- a/submodules/build/Makefile.ios6-beta +++ b/submodules/build/Makefile.xcode4.4 @@ -54,28 +54,28 @@ endif LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) build: - make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) all \ + make -f builder-iphone-os.mk host=armv6-apple-darwin $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk delivery-sdk ipa: build make -f builder-iphone-simulator.mk ipa \ - && make -f builder-iphone-os.mk ipa \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin ipa \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin ipa \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin ipa clean: make -f builder-iphone-simulator.mk clean \ - && make -f builder-iphone-os.mk clean \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin clean \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin clean clean-makefile: make -f builder-iphone-simulator.mk clean-makefile \ - && make -f builder-iphone-os.mk clean-makefile \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean-makefile \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin clean-makefile \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile veryclean: make -f builder-iphone-simulator.mk veryclean \ - && make -f builder-iphone-os.mk veryclean \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin veryclean \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin veryclean \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 35e345620..d481f90a5 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -115,7 +115,7 @@ veryclean: veryclean-linphone veryclean-msbcg729 clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 +veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx #-cd $(LINPHONE_BUILD_DIR) && make distclean -cd $(LINPHONE_SRC_DIR) && rm -f configure diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 8b65258a9..8cf0564ec 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -34,6 +34,9 @@ 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\ + && rm -f patched.stamp rm -rf $(BUILDER_BUILD_DIR)/$(libvpx_dir) clean-makefile-libvpx: