From 9cff1a63a23868912fef9386c1f6c7cbc9399dd8 Mon Sep 17 00:00:00 2001 From: Erich Keane Date: Tue, 3 Feb 2015 14:11:38 -0800 Subject: [PATCH] Removed boost program_options from build Program Options were only used for the ocicuc directory, however that has been removed. Therefore we don't need to use it to build anymore. Additionally, it was not included in any files or used in any make files. Change-Id: I12a195b28d549fc1ca86062f9628aca59def4a61 Signed-off-by: Erich Keane Reviewed-on: https://gerrit.iotivity.org/gerrit/301 Tested-by: jenkins-iotivity Reviewed-by: Ossama Othman Reviewed-by: Patrick Lankswert --- extlibs/buildDependencies.sh | 3 +-- resource/third_party_libs.scons | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/extlibs/buildDependencies.sh b/extlibs/buildDependencies.sh index 9b919d2..9c65248 100755 --- a/extlibs/buildDependencies.sh +++ b/extlibs/buildDependencies.sh @@ -43,7 +43,7 @@ function buildBoost { if [ ! -d "${BOOST_NAME}" ]; then unpackBoost fi - + TOOLCHAIN=${ANDROID_NDK}/toolchains/${TOOLSET}-${VERSION}/prebuilt/linux-x86/bin echo "Copying user configs to boost" cp ../resource/patches/user-config-${TOOLSET}.jam ${BOOST_NAME}/tools/build/v2/user-config.jam @@ -62,7 +62,6 @@ function buildBoost { -s PLATFORM=android-${PLATFORM} \ -s VERSION=${VERSION} \ --with-thread \ - --with-program_options \ install popd diff --git a/resource/third_party_libs.scons b/resource/third_party_libs.scons index 28fa4f1..e02d6be 100644 --- a/resource/third_party_libs.scons +++ b/resource/third_party_libs.scons @@ -28,10 +28,6 @@ if target_os in ['linux', 'tizen']: conf = Configure(lib_env) - if not conf.CheckLib('boost_program_options'): - print 'Did not find boost_program_options, exiting!' - Exit(1) - if not conf.CheckLib('glib-2.0'): print 'Install glib-2 on ubuntu with the following command' print 'sudo apt-get install libglib2.0-dev' -- 2.7.4