From 068dc7b17c4f2a057ca8d99e1378f306a80d14ac Mon Sep 17 00:00:00 2001 From: "munkyu.im" Date: Wed, 28 Aug 2013 16:41:38 +0900 Subject: [PATCH] package: apply emulator-lib-dev package Change-Id: Ie0c59c492a78373472472df38a50bf5c7514a874 Signed-off-by: munkyu.im --- package/build.macos-64 | 90 ++++++++++++++++++++++++++---------------------- package/changelog | 3 ++ package/pkginfo.manifest | 4 +-- tizen/src/Makefile | 2 ++ 4 files changed, 55 insertions(+), 44 deletions(-) diff --git a/package/build.macos-64 b/package/build.macos-64 index 06810f2..0baabb7 100755 --- a/package/build.macos-64 +++ b/package/build.macos-64 @@ -2,16 +2,16 @@ # clean clean() { - prepare + prepare - cd $SRCDIR/tizen - if test -e "Makefile" - then - ./emulator_configure.sh x86 - make distclean - fi - rm -rf $SRCDIR/*.zip - rm -rf $SRCDIR/*.tar.gz + cd $SRCDIR/tizen + if test -e "Makefile" + then + ./emulator_configure.sh x86 -e "$BUILD_CFLAGS $BUILD_LDFLAGS" + make distclean + fi + rm -rf $SRCDIR/*.zip + rm -rf $SRCDIR/*.tar.gz } # check build environment @@ -24,53 +24,59 @@ prepare() echo "as a system environment variable on your PC!!" exit 1 fi + + BUILD_CFLAGS=--extra-cflags=-I$ROOTDIR/include + BUILD_LDFLAGS=--extra-ldflags=-L$ROOTDIR/lib } # build build() { - cd $SRCDIR/tizen/ - ./emulator_configure.sh x86 - make all_dibs - if [ $? -eq 0 ] - then - echo "build success" - else - echo "build failure" - exit 1 - fi + prepare + + cd $SRCDIR/tizen/ + + ./emulator_configure.sh x86 -e "$BUILD_CFLAGS $BUILD_LDFLAGS" + make all_dibs + if [ $? -eq 0 ] + then + echo "build success" + else + echo "build failure" + exit 1 + fi -# make install_dibs -# make clean +# make install_dibs +# make clean # -# ./emulator_configure.sh arm -# make all_dibs -# if [ $? -eq 0 ] -# then -# echo "arm build success" -# else -# echo "arm build failure" -# exit 1 -# fi -# make install_dibs +# ./emulator_configure.sh arm +# make all_dibs +# if [ $? -eq 0 ] +# then +# echo "arm build success" +# else +# echo "arm build failure" +# exit 1 +# fi +# make install_dibs } # install install() { - X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools -# ARM_BIN_DIR=$SRCDIR/package/emulator-qemu-arm.package.${TARGET_OS}/data/tools - COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools - mkdir -p $X86_BIN_DIR -# mkdir -p $ARM_BIN_DIR - mkdir -p $COMMON_BIN_DIR + X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools +# ARM_BIN_DIR=$SRCDIR/package/emulator-qemu-arm.package.${TARGET_OS}/data/tools + COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools + mkdir -p $X86_BIN_DIR +# mkdir -p $ARM_BIN_DIR + mkdir -p $COMMON_BIN_DIR - cd $SRCDIR/tizen - make install_dibs + cd $SRCDIR/tizen + make install_dibs - mv x86 $X86_BIN_DIR/emulator -# mv x86 $ARM_BIN_DIR/emulator - mv common $COMMON_BIN_DIR/emulator + mv x86 $X86_BIN_DIR/emulator +# mv x86 $ARM_BIN_DIR/emulator + mv common $COMMON_BIN_DIR/emulator } [ "$1" = "clean" ] && clean diff --git a/package/changelog b/package/changelog index 151089e..396d4ac 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 1.5.83 +- apply emulator-lib-dev package +== Munkyu Im 2013-08-28 * 1.5.82 - remove sdb notification == Munkyu Im 2013-08-26 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index c211184..e2a79b6 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version: 1.5.82 +Version: 1.5.83 Maintainer: Yeong-Kyoon Lee Source: emulator @@ -71,7 +71,7 @@ Description: Tizen x86 Emulator Package: emulator-qemu-x86 OS: macos-64 Build-host-os: macos-64 -Build-dependency: emulator-lib [ macos-64 ] +Build-dependency: emulator-lib [ macos-64 ], emulator-lib-dev [ macos-64 ] Install-dependency: emulator-kernel-x86 [ macos-64 ], vgabios [ macos-64 ] Description: Tizen x86 Emulator diff --git a/tizen/src/Makefile b/tizen/src/Makefile index acae816..778f2d9 100644 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -163,6 +163,7 @@ ifdef CONFIG_DARWIN install_name_tool -change /opt/local/lib/libz.1.dylib @loader_path/libz.1.dylib $(EMUL_DIR)/bin/emulator-x86 ;\ install_name_tool -change /opt/local/lib/libncurses.5.dylib @loader_path/libncurses.5.dylib $(EMUL_DIR)/bin/emulator-x86 ;\ install_name_tool -change /opt/local/lib/libcurl.4.dylib @loader_path/libcurl.4.dylib $(EMUL_DIR)/bin/emulator-x86 ;\ + install_name_tool -change /opt/local/lib/libpixman-1.0.dylib @loader_path/libpixman-1.0.dylib $(EMUL_DIR)/bin/emulator-x86 ;\ ;; \ arm-softmmu) \ ;; \ @@ -264,6 +265,7 @@ ifdef CONFIG_DARWIN install_name_tool -change /opt/local/lib/libz.1.dylib @loader_path/libz.1.dylib $(DIBS_X86_DIR)/bin/emulator-x86 ;\ install_name_tool -change /opt/local/lib/libncurses.5.dylib @loader_path/libncurses.5.dylib $(DIBS_X86_DIR)/bin/emulator-x86 ;\ install_name_tool -change /opt/local/lib/libcurl.4.dylib @loader_path/libcurl.4.dylib $(DIBS_X86_DIR)/bin/emulator-x86 ;\ + install_name_tool -change /opt/local/lib/libpixman-1.0.dylib @loader_path/libpixman-1.0.dylib $(DIBS_X86_DIR)/bin/emulator-x86 ;\ ;; \ arm-softmmu) \ ;; \ -- 2.7.4