stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c4a1d268320d38f845f2ad2f967d3d432cade71c
commit c4a1d268320d38f845f2ad2f967d3d432cade71c
Author: Gwanglim Lee <gl77....@samsung.com>
Date: Tue Aug 5 15:20:11 2014 +0200
build/drm: Fix broken build from scratch and add missing library dependency
for evas_drm engine
Summary:
This patch fixes following two problems:
1. libevas.so library has a dependency with ecore_drm if '--enable-drm'
configure
option is given. This problem is due to 'EFL_INTERNAL_DEPEND_PKG([EVAS],
[ecore-drm])'
in m4/evas_check_engine.m4 file. A dependency with ecore_drm should be
moved to evas
drm engine not libevas.so. And also this macro makes an error while
installation of evas.
$ make uninstall; ./configure --enable-drm; make && make install
2. missing ecore_drm dependency for evas drm engine.
USE_ECORE_DRM_LIBS macro should be used for building evas drm engine with
ecore_drm
library. ECORE_DRM_LIBS macro doesn't have 'libecore_drm.la'. It is used
for building
ecore_drm library.
@fix
Fixes T1473
Test Plan:
1. Remove EFL libraries in installation path: $ make uninstall
2. Configure with --enable-drm: $ ./autogen.sh --enable-drm
3. $ make && make install
4. Check module.so of evas drm engine whether it has a library dependency
with ecore_drm
$ readelf -a $EFL_GIT/src/modules/evas/engines/drm/.libs/module.so | grep
NEEDED
$ readelf -a $INSTALL_PATH/lib/evas/modules/engines/drm/v-1.11/module.so
| grep NEEDED
Reviewers: stefan_schmidt, devilhorns, raster
Subscribers: cedric, torori
Differential Revision: https://phab.enlightenment.org/D1271
---
m4/evas_check_engine.m4 | 2 --
src/Makefile_Evas.am | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index 1db2f47..dd7030e 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -604,8 +604,6 @@ else
fi
if test "x${have_dep}" = "xyes" ; then
- EFL_INTERNAL_DEPEND_PKG([EVAS], [ecore-drm])
-
AC_MSG_CHECKING([whether to enable Drm hardware acceleration])
if test "x${want_drm_hw_accel}" = "xyes" ; then
PKG_CHECK_EXISTS([egl >= 7.10 ${gl_library}],
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index aab2d37..78d9be7 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1233,7 +1233,7 @@ modules_evas_engines_drm_module_la_CPPFLAGS =
-I$(top_builddir)/src/lib/efl \
@evas_engine_drm_cflags@
modules_evas_engines_drm_module_la_LIBADD = \
@USE_EVAS_LIBS@ \
-@ECORE_DRM_LIBS@ \
+@USE_ECORE_DRM_LIBS@ \
@evas_engine_drm_libs@
modules_evas_engines_drm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_drm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
--
