From 4919e2c6018f3959fd81f09192f6be907c1df7fc Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Wed, 2 Apr 2014 19:13:42 +0900 Subject: [PATCH] build: Avoid pkg-config bug on Windows Change-Id: I1754489290eaf18e4b2a263eb23b6a6f1ba31098 Signed-off-by: SeokYeon Hwang --- package/build.windows-32 | 6 +++++- tizen/emulator_configure.sh | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/build.windows-32 b/package/build.windows-32 index 6f091e74b9..031d3fd90d 100755 --- a/package/build.windows-32 +++ b/package/build.windows-32 @@ -37,7 +37,11 @@ prepare() PATH=$PATH:$PURIFIED_ROOTDIR/bin:$PURIFIED_ROOTDIR/apache-ant_1.9.2/bin:$PURIFIED_ROOTDIR/SDL_1.2.15/bin:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/bin:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/bin:$PURIFIED_ROOTDIR/pixman_0.30.0/bin export PATH - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/SDL_1.2.15/lib/pkgconfig:$ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$ROOTDIR/pixman_0.30.0/lib/pkgconfig + if [ -z ${PKG_CONFIG_PATH} ] ; then # avoid pkg-config bug on Window + export PKG_CONFIG_PATH=$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/SDL_1.2.15/lib/pkgconfig:$ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$ROOTDIR/pixman_0.30.0/lib/pkgconfig + else + export PKG_CONFIG_PATH=$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/SDL_1.2.15/lib/pkgconfig:$ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$ROOTDIR/pixman_0.30.0/lib/pkgconfig:${PKG_CONFIG_PATH} + fi BUILD_CFLAGS+=--extra-cflags="-I$ROOTDIR/SDL_1.2.15/include/SDL " BUILD_CFLAGS+=--extra-cflags="-I$ROOTDIR/gtk-bundle_2.24.10/include " diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh index 88a6247164..cd274d4370 100755 --- a/tizen/emulator_configure.sh +++ b/tizen/emulator_configure.sh @@ -143,6 +143,8 @@ set_target() { targetos=`uname -s` echo "##### checking for os... targetos $targetos" +echo "##### TIZEN_SDK_DEV_PATH: ${TIZEN_SDK_DEV_PATH}" + echo "$*" while [ "$#" -gt "0" ] @@ -216,7 +218,11 @@ fi # append common flags CONFIGURE_APPEND="--enable-maru --enable-libav $CONFIGURE_APPEND" +if [ -z ${PKG_CONFIG_PATH} ] ; then # avoid pkg-config bug on Windows +export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/distrib/lib/pkgconfig +else export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/distrib/lib/pkgconfig:${PKG_CONFIG_PATH} +fi case $targetos in Linux*) -- 2.34.1