forked from enlightenment/efl
build: fix rpath for binaries which use ecore-x dependencies
somehow ecore-x explicitly pulls in ${libdir}/libX11.so at link-time,
which causes libtool to add ${libdir} to the rpath executable wrappers
before the remainder of the in-tree efl paths. this causes binaries run
from these wrappers (e.g., tests, built-time tools such as codegens) to
use system libraries instead of in-tree libraries
@fix
Differential Revision: https://phab.enlightenment.org/D6635
This commit is contained in:
Mike Blumenkrantz
Stefan Schmidt
parent
c87dd2214c
commit
bc0d74c281
18
m4/efl.m4
18
m4/efl.m4
|
|
@ -188,9 +188,9 @@ case "m4_defn([DOWNOTHER])" in
|
|||
;;
|
||||
esac
|
||||
requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
|
||||
requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
|
||||
requirements_internal_libs_[]m4_defn([DOWNEFL])="lib/${libdirname}/lib${libname}.la ${requirements_internal_libs_[][]m4_defn([DOWNEFL])}"
|
||||
requirements_internal_deps_libs_[]m4_defn([DOWNEFL])="${requirements_public_libs_[]m4_defn([DOWNOTHER])} ${requirements_internal_deps_libs_[][]m4_defn([DOWNEFL])}"
|
||||
requirements_cflags_[]m4_defn([DOWNEFL])="${requirements_cflags_[][]m4_defn([DOWNEFL])} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname}"
|
||||
requirements_internal_libs_[]m4_defn([DOWNEFL])="${requirements_internal_libs_[][]m4_defn([DOWNEFL])} lib/${libdirname}/lib${libname}.la"
|
||||
requirements_internal_deps_libs_[]m4_defn([DOWNEFL])="${requirements_internal_deps_libs_[][]m4_defn([DOWNEFL])} ${requirements_public_libs_[]m4_defn([DOWNOTHER])}"
|
||||
m4_popdef([DOWNOTHER])dnl
|
||||
m4_popdef([DOWNEFL])dnl
|
||||
])
|
||||
|
|
@ -224,10 +224,10 @@ dnl the given EFL will use/depend on system crypto settings
|
|||
AC_DEFUN([EFL_CRYPTO_DEPEND],
|
||||
[dnl
|
||||
m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
|
||||
requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_crypto} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
|
||||
requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_crypto} ${requirements_pc_deps_[][]m4_defn([DOWNEFL])}"
|
||||
requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_crypto} ${requirements_libs_[][]m4_defn([DOWNEFL])}"
|
||||
requirements_cflags_[]m4_defn([DOWNEFL])="${requirements_cflags_crypto} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
|
||||
requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[][]m4_defn([DOWNEFL])} ${requirements_pc_crypto}"
|
||||
requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_[][]m4_defn([DOWNEFL])} ${requirements_pc_deps_crypto}"
|
||||
requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[][]m4_defn([DOWNEFL])} ${requirements_libs_crypto}"
|
||||
requirements_cflags_[]m4_defn([DOWNEFL])="${requirements_cflags_[][]m4_defn([DOWNEFL])} ${requirements_cflags_crypto}"
|
||||
m4_popdef([DOWNEFL])dnl
|
||||
])
|
||||
|
||||
|
|
@ -245,8 +245,8 @@ m4_pushdef([DOWNNAME], m4_translit([$2], [-A-Z], [_a-z]))dnl
|
|||
|
||||
EFL_PKG_CHECK_STRICT([$3], [
|
||||
AC_DEFINE([HAVE_]m4_defn([UPNAME]), [1], [Have `]m4_defn([DOWNNAME])[' pkg-config installed.])
|
||||
requirements_pc_[]m4_defn([DOWNEFL])="$3 ${requirements_pc_[][]m4_defn([DOWNEFL])}"
|
||||
requirements_pc_deps_[]m4_defn([DOWNEFL])="$3 ${requirements_pc_deps_[]m4_defn([DOWNEFL])}"
|
||||
requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[][]m4_defn([DOWNEFL])} $3"
|
||||
requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_[]m4_defn([DOWNEFL])} $3"
|
||||
have_[]m4_defn([DOWNNAME])="yes"
|
||||
|
||||
$4
|
||||
|
|
|
|||
|
|
@ -295,36 +295,36 @@ tests_ecore_ecore_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
|
|||
@ECORE_CFLAGS@ \
|
||||
@ECORE_AUDIO_CFLAGS@ \
|
||||
@ECORE_FILE_CFLAGS@ \
|
||||
@ECORE_X_CFLAGS@ \
|
||||
@ECORE_IMF_CFLAGS@ \
|
||||
@ECORE_EVAS_CFLAGS@ \
|
||||
@ECORE_WAYLAND_CFLAGS@ \
|
||||
@ECORE_WAYLAND_SRV_CFLAGS@ \
|
||||
@ECORE_FB_CFLAGS@ \
|
||||
@ECORE_INPUT_CFLAGS@
|
||||
@ECORE_INPUT_CFLAGS@ \
|
||||
@ECORE_X_CFLAGS@ \
|
||||
@ECORE_WAYLAND_CFLAGS@ \
|
||||
@ECORE_WAYLAND_SRV_CFLAGS@
|
||||
|
||||
tests_ecore_ecore_suite_LDADD = \
|
||||
@CHECK_LIBS@ \
|
||||
@USE_ECORE_LIBS@ \
|
||||
@USE_ECORE_AUDIO_LIBS@ \
|
||||
@USE_ECORE_FILE_LIBS@ \
|
||||
@USE_ECORE_X_LIBS@ \
|
||||
@USE_ECORE_IMF_LIBS@ \
|
||||
@USE_ECORE_EVAS_LIBS@ \
|
||||
@USE_ECORE_WAYLAND_LIBS@ \
|
||||
@USE_ECORE_FB_LIBS@ \
|
||||
@ECORE_WAYLAND_SRV_LIBS@ \
|
||||
@USE_ECORE_INPUT_LIBS@
|
||||
@USE_ECORE_INPUT_LIBS@ \
|
||||
@USE_ECORE_X_LIBS@ \
|
||||
@USE_ECORE_WAYLAND_LIBS@ \
|
||||
@ECORE_WAYLAND_SRV_LIBS@
|
||||
tests_ecore_ecore_suite_DEPENDENCIES = \
|
||||
@USE_ECORE_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_FILE_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_X_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_IMF_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_EVAS_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_WAYLAND_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_FB_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_INPUT_INTERNAL_LIBS@
|
||||
@USE_ECORE_INPUT_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_X_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_WAYLAND_INTERNAL_LIBS@
|
||||
|
||||
tests_ecore_efl_app_suite_SOURCES = \
|
||||
tests/ecore/efl_app_test_loop.c \
|
||||
|
|
@ -341,36 +341,36 @@ tests_ecore_efl_app_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
|
|||
@ECORE_CFLAGS@ \
|
||||
@ECORE_AUDIO_CFLAGS@ \
|
||||
@ECORE_FILE_CFLAGS@ \
|
||||
@ECORE_X_CFLAGS@ \
|
||||
@ECORE_IMF_CFLAGS@ \
|
||||
@ECORE_EVAS_CFLAGS@ \
|
||||
@ECORE_WAYLAND_CFLAGS@ \
|
||||
@ECORE_WAYLAND_SRV_CFLAGS@ \
|
||||
@ECORE_FB_CFLAGS@ \
|
||||
@ECORE_INPUT_CFLAGS@
|
||||
@ECORE_INPUT_CFLAGS@ \
|
||||
@ECORE_X_CFLAGS@ \
|
||||
@ECORE_WAYLAND_CFLAGS@ \
|
||||
@ECORE_WAYLAND_SRV_CFLAGS@
|
||||
|
||||
tests_ecore_efl_app_suite_LDADD = \
|
||||
@CHECK_LIBS@ \
|
||||
@USE_ECORE_LIBS@ \
|
||||
@USE_ECORE_AUDIO_LIBS@ \
|
||||
@USE_ECORE_FILE_LIBS@ \
|
||||
@USE_ECORE_X_LIBS@ \
|
||||
@USE_ECORE_IMF_LIBS@ \
|
||||
@USE_ECORE_EVAS_LIBS@ \
|
||||
@USE_ECORE_WAYLAND_LIBS@ \
|
||||
@USE_ECORE_FB_LIBS@ \
|
||||
@ECORE_WAYLAND_SRV_LIBS@ \
|
||||
@USE_ECORE_INPUT_LIBS@
|
||||
@USE_ECORE_INPUT_LIBS@ \
|
||||
@USE_ECORE_X_LIBS@ \
|
||||
@USE_ECORE_WAYLAND_LIBS@ \
|
||||
@ECORE_WAYLAND_SRV_LIBS@
|
||||
tests_ecore_efl_app_suite_DEPENDENCIES = \
|
||||
@USE_ECORE_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_FILE_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_X_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_IMF_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_EVAS_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_WAYLAND_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_FB_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_INPUT_INTERNAL_LIBS@
|
||||
@USE_ECORE_INPUT_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_X_INTERNAL_LIBS@ \
|
||||
@USE_ECORE_WAYLAND_INTERNAL_LIBS@
|
||||
|
||||
if HAVE_ECORE_X
|
||||
tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_x.c
|
||||
|
|
|
|||
Loading…
Reference in New Issue