From e17b708bcc7c81235c3d18da5778845a634caca3 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Fri, 9 Dec 2016 14:09:24 +0900 Subject: [PATCH] [evas wayland_shm] Use absolute library path Change-Id: I4437618487fcfb1a2cc77ade555402b87e04880a --- packaging/efl.spec | 2 ++ src/modules/evas/engines/wayland_shm/evas_engine.c | 2 +- src/modules/evas/engines/wayland_shm/evas_tbmbuf.c | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) mode change 100755 => 100644 packaging/efl.spec mode change 100755 => 100644 src/modules/evas/engines/wayland_shm/evas_tbmbuf.c diff --git a/packaging/efl.spec b/packaging/efl.spec old mode 100755 new mode 100644 index 5d71ca0..52e7ecc --- a/packaging/efl.spec +++ b/packaging/efl.spec @@ -690,6 +690,8 @@ CFLAGS+=" -DMESA_EGL_NO_X11_HEADERS " CFLAGS+=" -DEFL_FEATURE_EMULATOR " %endif +CFLAGS+=" -DLIBDIR=\\\"%{_libdir}\\\"" + %if "%{asan}" == "1" %restore_fcommon %endif diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c index 618ce80..09dde2d 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.c +++ b/src/modules/evas/engines/wayland_shm/evas_engine.c @@ -93,7 +93,7 @@ _symbols(void) { static int done = 0; int fail = 0; - const char *wayland_tbm_server_lib = "libwayland-tbm-server.so.0"; + const char *wayland_tbm_server_lib = LIBDIR"/libwayland-tbm-server.so.0"; if (done) return; diff --git a/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c b/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c old mode 100755 new mode 100644 index 4f3df5c..9b619da --- a/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c @@ -149,13 +149,13 @@ tbm_init(void) const char *tbm_libs[] = { - "libtbm.so.1", - "libtbm.so.0", + LIBDIR"/libtbm.so.1", + LIBDIR"/libtbm.so.0", NULL, }; const char *tbm_clients[] = { - "libwayland-tbm-client.so.0", + LIBDIR"/libwayland-tbm-client.so.0", NULL, }; int i, fail; -- 2.7.4