From: munkyu.im Date: Fri, 28 Dec 2012 09:19:48 +0000 (+0900) Subject: build: modify loading dynamic library path X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1243^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2105ac0142cbb4625b340fd596cfe2418fc5957;p=sdk%2Femulator%2Fqemu.git build: modify loading dynamic library path Fix laoding dynamic library. emulator-x86 and qemu-img can load their library from the same path first. Signed-off-by: munkyu.im --- diff --git a/tizen/src/Makefile b/tizen/src/Makefile index d7ec085de8..b30e5eb80c 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -124,6 +124,22 @@ else cp -pPR skin/client/native_src/libshared.dylib $(EMUL_DIR)/bin endif +ifdef CONFIG_DARWIN + install_name_tool -change /opt/local/lib/libgthread-2.0.*.dylib libgthread-2.0.0.dylib $(EMUL_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/libglib-2.0.*.dylib libglib-2.0.0.dylib $(EMUL_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/libintl.8.dylib libintl.8.dylib $(EMUL_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/gcc47/libgcc_s.1.dylib libgcc_s.1.dylib $(EMUL_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/libz.1.dylib libz.1.dylib $(EMUL_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/libcurl.4.dylib libcurl.4.dylib $(EMUL_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/libgthread-2.0.*.dylib libgthread-2.0.0.dylib $(EMUL_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/libglib-2.0.*.dylib libglib-2.0.0.dylib $(EMUL_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/libintl.8.dylib libintl.8.dylib $(EMUL_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/gcc47/libgcc_s.1.dylib libgcc_s.1.dylib $(EMUL_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/libz.1.dylib libz.1.dylib $(EMUL_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/libncurses.5.dylib libncurses.5.dylib $(EMUL_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/libcurl.4.dylib libcurl.4.dylib $(EMUL_DIR)/bin/emulator-x86 +endif + # for dibs system... all_dibs: qemu skin_client_dibs skin_client_dibs: @@ -197,3 +213,19 @@ else cp -pPR skin/client/skins $(DIBS_COMMON_DIR) cp -pPR skin/client/native_src/libshared.dylib $(DIBS_COMMON_DIR)/bin endif + +ifdef CONFIG_DARWIN + install_name_tool -change /opt/local/lib/libgthread-2.0.*.dylib libgthread-2.0.0.dylib $(DIBS_COMMON_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/libglib-2.0.*.dylib libglib-2.0.0.dylib $(DIBS_COMMON_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/libintl.8.dylib libintl.8.dylib $(DIBS_COMMON_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/gcc47/libgcc_s.1.dylib libgcc_s.1.dylib $(DIBS_COMMON_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/libz.1.dylib libz.1.dylib $(DIBS_COMMON_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/libcurl.4.dylib libcurl.4.dylib $(DIBS_COMMON_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/libgthread-2.0.*.dylib libgthread-2.0.0.dylib $(DIBS_COMMON_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/libglib-2.0.*.dylib libglib-2.0.0.dylib $(DIBS_COMMON_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/libintl.8.dylib libintl.8.dylib $(DIBS_COMMON_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/gcc47/libgcc_s.1.dylib libgcc_s.1.dylib $(DIBS_COMMON_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/libz.1.dylib libz.1.dylib $(DIBS_COMMON_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/libncurses.5.dylib libncurses.5.dylib $(DIBS_COMMON_DIR)/bin/emulator-x86 + install_name_tool -change /opt/local/lib/libcurl.4.dylib libcurl.4.dylib $(DIBS_COMMON_DIR)/bin/emulator-x86 +endif