summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThanatermesis <thanatermesis.ecvs@gmail.com>2012-02-27 05:20:17 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-02-27 05:20:17 +0000
commit4776bcfbd7856047b4d6ac6e9a769fa84f6e163d (patch)
treea55ccf95fffda3a049c8f914e36b0144065278d6
parent496ad067f4d61535a52b305fa6e9ba4d3f4098b6 (diff)
Fix linking complaints brought out by:
From: Thanatermesis <thanatermesis.ecvs@gmail.com> Subject: [E-devel] LDFLAGS with -Wl,-z,defs Aparently if you add the option "-Wl,-z,defs" to your LDFLAGS, there's some libs that doesn't compile, like evas and e_dbus, there's some logs: SVN revision: 68464
Diffstat (limited to '')
-rw-r--r--legacy/emotion/m4/emotion_check.m428
-rw-r--r--legacy/emotion/src/edje_external/Makefile.am2
-rw-r--r--legacy/emotion/src/modules/generic/Makefile.am2
-rw-r--r--legacy/emotion/src/modules/gstreamer/Makefile.am2
-rw-r--r--legacy/emotion/src/modules/xine/Makefile.am2
-rw-r--r--legacy/ethumb/configure.ac1
-rw-r--r--legacy/ethumb/src/lib/client/Makefile.am2
-rw-r--r--legacy/ethumb/src/plugins/emotion/Makefile.am4
-rw-r--r--legacy/evas/src/modules/engines/software_generic/Makefile.am2
-rw-r--r--legacy/evas/src/modules/engines/wayland_egl/Makefile.am2
-rw-r--r--legacy/evas/src/modules/loaders/bmp/Makefile.am2
11 files changed, 42 insertions, 7 deletions
diff --git a/legacy/emotion/m4/emotion_check.m4 b/legacy/emotion/m4/emotion_check.m4
index ebd7e7e320..f70a2c3bcf 100644
--- a/legacy/emotion/m4/emotion_check.m4
+++ b/legacy/emotion/m4/emotion_check.m4
@@ -172,6 +172,34 @@ AC_ARG_ENABLE(generic-[]DOWN,
172 ], 172 ],
173 [enable_module="auto"]) 173 [enable_module="auto"])
174 174
175SHM_OPEN_LIBS=""
176AC_COMPILE_IFELSE(
177 [AC_LANG_PROGRAM(
178 [[
179#include <sys/mman.h>
180#include <sys/stat.h>
181#include <fcntl.h>
182 ]],
183 [[
184int fd;
185fd = shm_open("/", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
186shm_unlink("/");
187 ]])],
188 [
189 have_shm_open="yes"
190 AC_DEFINE(HAVE_SHM_OPEN, 1, [Have shm_open() call])
191 SHM_OPEN_LIBS="-lrt"
192 ],
193 [have_shm_open="no"])
194AC_SUBST(SHM_OPEN_LIBS)
195
196AC_MSG_CHECKING([shm_open])
197AC_MSG_RESULT([${have_shm_open}])
198
199if test "x{have_shm_open)" != "xyes"; then
200 enable_generic="no"
201fi
202
175if test "x${enable_generic}" != "xyes" && test "x${enable_generic}" != "xstatic"; then 203if test "x${enable_generic}" != "xyes" && test "x${enable_generic}" != "xstatic"; then
176 if test "x${enable_module}" = "xyes"; then 204 if test "x${enable_module}" = "xyes"; then
177 AC_MSG_WARN([Generic module is disabled, force disable of Generic Player $1]) 205 AC_MSG_WARN([Generic module is disabled, force disable of Generic Player $1])
diff --git a/legacy/emotion/src/edje_external/Makefile.am b/legacy/emotion/src/edje_external/Makefile.am
index bd92c54234..9b36fafd4f 100644
--- a/legacy/emotion/src/edje_external/Makefile.am
+++ b/legacy/emotion/src/edje_external/Makefile.am
@@ -13,6 +13,6 @@ pkgdir = $(libdir)/edje/modules/emotion/$(MODULE_EDJE)
13pkg_LTLIBRARIES = module.la 13pkg_LTLIBRARIES = module.la
14 14
15module_la_SOURCES = emotion.c 15module_la_SOURCES = emotion.c
16module_la_LIBADD = $(top_builddir)/src/lib/libemotion.la @EDJE_EXTERNAL_LIBS@ 16module_la_LIBADD = @EMOTION_LIBS@ $(top_builddir)/src/lib/libemotion.la @EDJE_EXTERNAL_LIBS@
17module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 17module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
18module_la_LIBTOOLFLAGS = --tag=disable-static 18module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/legacy/emotion/src/modules/generic/Makefile.am b/legacy/emotion/src/modules/generic/Makefile.am
index 0e6455972f..04fbab540c 100644
--- a/legacy/emotion/src/modules/generic/Makefile.am
+++ b/legacy/emotion/src/modules/generic/Makefile.am
@@ -22,7 +22,7 @@ includesdir = $(includedir)/emotion-@VMAJ@
22noinst_HEADERS = emotion_generic.h 22noinst_HEADERS = emotion_generic.h
23 23
24em_generic_la_SOURCES = emotion_generic.c 24em_generic_la_SOURCES = emotion_generic.c
25em_generic_la_LIBADD = $(top_builddir)/src/lib/libemotion.la 25em_generic_la_LIBADD = @EMOTION_LIBS@ @SHM_OPEN_LIBS@ $(top_builddir)/src/lib/libemotion.la
26em_generic_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 26em_generic_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
27em_generic_la_LIBTOOLFLAGS = --tag=disable-static 27em_generic_la_LIBTOOLFLAGS = --tag=disable-static
28em_generic_la_DEPENDENCIES = emotion_generic.h Emotion_Generic_Plugin.h 28em_generic_la_DEPENDENCIES = emotion_generic.h Emotion_Generic_Plugin.h
diff --git a/legacy/emotion/src/modules/gstreamer/Makefile.am b/legacy/emotion/src/modules/gstreamer/Makefile.am
index fef825e756..367251096f 100644
--- a/legacy/emotion/src/modules/gstreamer/Makefile.am
+++ b/legacy/emotion/src/modules/gstreamer/Makefile.am
@@ -26,7 +26,7 @@ emotion_alloc.c \
26emotion_fakeeos.c \ 26emotion_fakeeos.c \
27emotion_convert.c 27emotion_convert.c
28 28
29gstreamer_la_LIBADD = @ECORE_X_LIBS@ @GSTREAMER_LIBS@ @GSTREAMER_INTERFACE_LIBS@ $(top_builddir)/src/lib/libemotion.la 29gstreamer_la_LIBADD = @EMOTION_LIBS@ @ECORE_X_LIBS@ @GSTREAMER_LIBS@ @GSTREAMER_INTERFACE_LIBS@ $(top_builddir)/src/lib/libemotion.la
30gstreamer_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 30gstreamer_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
31gstreamer_la_LIBTOOLFLAGS = --tag=disable-static 31gstreamer_la_LIBTOOLFLAGS = --tag=disable-static
32gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h 32gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h
diff --git a/legacy/emotion/src/modules/xine/Makefile.am b/legacy/emotion/src/modules/xine/Makefile.am
index 455e3932bf..baf8fecab5 100644
--- a/legacy/emotion/src/modules/xine/Makefile.am
+++ b/legacy/emotion/src/modules/xine/Makefile.am
@@ -23,7 +23,7 @@ xine_la_SOURCES = \
23emotion_xine.c \ 23emotion_xine.c \
24emotion_xine.h \ 24emotion_xine.h \
25emotion_xine_vo_out.c 25emotion_xine_vo_out.c
26xine_la_LIBADD = @XINE_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread 26xine_la_LIBADD = @EMOTION_LIBS@ @XINE_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
27xine_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 27xine_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
28xine_la_LIBTOOLFLAGS = --tag=disable-static 28xine_la_LIBTOOLFLAGS = --tag=disable-static
29 29
diff --git a/legacy/ethumb/configure.ac b/legacy/ethumb/configure.ac
index 060b6aab2a..c7b23ee313 100644
--- a/legacy/ethumb/configure.ac
+++ b/legacy/ethumb/configure.ac
@@ -127,6 +127,7 @@ PKG_CHECK_MODULES(ECORE, [ecore >= 1.0.0])
127PKG_CHECK_MODULES(ECORE_EVAS, [ecore-evas >= 1.0.0]) 127PKG_CHECK_MODULES(ECORE_EVAS, [ecore-evas >= 1.0.0])
128PKG_CHECK_MODULES(ECORE_FILE, [ecore-file >= 1.0.0 ]) 128PKG_CHECK_MODULES(ECORE_FILE, [ecore-file >= 1.0.0 ])
129PKG_CHECK_MODULES(EDJE, [edje >= 1.0.0]) 129PKG_CHECK_MODULES(EDJE, [edje >= 1.0.0])
130PKG_CHECK_MODULES(EET, [eet >= 1.4.0])
130EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) 131EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
131 132
132requirement_ethumb="eina >= 1.0.0 evas >= 1.0.0 ecore >= 1.0.0 ecore-evas >= 1.0.0 ecore-file >= 1.0.0 edje >= 1.0.0" 133requirement_ethumb="eina >= 1.0.0 evas >= 1.0.0 ecore >= 1.0.0 ecore-evas >= 1.0.0 ecore-file >= 1.0.0 edje >= 1.0.0"
diff --git a/legacy/ethumb/src/lib/client/Makefile.am b/legacy/ethumb/src/lib/client/Makefile.am
index 9111f04369..e7faae213d 100644
--- a/legacy/ethumb/src/lib/client/Makefile.am
+++ b/legacy/ethumb/src/lib/client/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS = \
5-I$(top_builddir) \ 5-I$(top_builddir) \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7@EFL_ETHUMB_CLIENT_BUILD@ \ 7@EFL_ETHUMB_CLIENT_BUILD@ \
8@ECORE_CFLAGS@ \
8@EDBUS_CFLAGS@ \ 9@EDBUS_CFLAGS@ \
9@EINA_CFLAGS@ 10@EINA_CFLAGS@
10 11
@@ -16,6 +17,7 @@ lib_LTLIBRARIES = libethumb_client.la
16libethumb_client_la_SOURCES = ethumb_client.c 17libethumb_client_la_SOURCES = ethumb_client.c
17libethumb_client_la_LIBADD = \ 18libethumb_client_la_LIBADD = \
18$(top_builddir)/src/lib/libethumb.la \ 19$(top_builddir)/src/lib/libethumb.la \
20@ECORE_LIBS@ \
19@EDBUS_LIBS@ \ 21@EDBUS_LIBS@ \
20@EINA_LIBS@ 22@EINA_LIBS@
21libethumb_client_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ 23libethumb_client_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
diff --git a/legacy/ethumb/src/plugins/emotion/Makefile.am b/legacy/ethumb/src/plugins/emotion/Makefile.am
index 495a9a3790..0c4565f0ee 100644
--- a/legacy/ethumb/src/plugins/emotion/Makefile.am
+++ b/legacy/ethumb/src/plugins/emotion/Makefile.am
@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
15-I$(top_srcdir)/src/lib \ 15-I$(top_srcdir)/src/lib \
16-I$(top_srcdir)/src/plugins/emotion \ 16-I$(top_srcdir)/src/plugins/emotion \
17-DPLUGINSDIR=\"$(pluginsdir)\" \ 17-DPLUGINSDIR=\"$(pluginsdir)\" \
18@ECORE_EVAS_CFLAGS@ \
19@EET_CFLAGS@ \
18@EFL_ETHUMB_BUILD@ \ 20@EFL_ETHUMB_BUILD@ \
19@EVAS_CFLAGS@ \ 21@EVAS_CFLAGS@ \
20@EINA_CFLAGS@ \ 22@EINA_CFLAGS@ \
@@ -27,6 +29,8 @@ pkg_LTLIBRARIES = emotion.la
27emotion_la_SOURCES = emotion.c 29emotion_la_SOURCES = emotion.c
28emotion_la_LIBADD = \ 30emotion_la_LIBADD = \
29$(top_builddir)/src/lib/libethumb.la \ 31$(top_builddir)/src/lib/libethumb.la \
32@ECORE_EVAS_LIBS@ \
33@EET_LIBS@ \
30@EMOTION_LIBS@ \ 34@EMOTION_LIBS@ \
31@EDJE_LIBS@ \ 35@EDJE_LIBS@ \
32@ECORE_FILE_LIBS@ \ 36@ECORE_FILE_LIBS@ \
diff --git a/legacy/evas/src/modules/engines/software_generic/Makefile.am b/legacy/evas/src/modules/engines/software_generic/Makefile.am
index 0a83e68cc2..e605dace61 100644
--- a/legacy/evas/src/modules/engines/software_generic/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_generic/Makefile.am
@@ -20,7 +20,7 @@ pkg_LTLIBRARIES = module.la
20 20
21module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES) 21module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES)
22 22
23module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la 23module_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ $(top_builddir)/src/lib/libevas.la
24module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 24module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 25module_la_LIBTOOLFLAGS = --tag=disable-static
26 26
diff --git a/legacy/evas/src/modules/engines/wayland_egl/Makefile.am b/legacy/evas/src/modules/engines/wayland_egl/Makefile.am
index 100614f364..9234b33855 100644
--- a/legacy/evas/src/modules/engines/wayland_egl/Makefile.am
+++ b/legacy/evas/src/modules/engines/wayland_egl/Makefile.am
@@ -18,7 +18,7 @@ WAYLAND_EGL_SOURCES = \
18evas_engine.c \ 18evas_engine.c \
19evas_wl_main.c 19evas_wl_main.c
20 20
21WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EINA_LIBS@ @evas_engine_wayland_egl_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la 21WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EINA_LIBS@ @evas_engine_wayland_egl_libs@ @dlopen_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
22 22
23includes_HEADERS = Evas_Engine_Wayland_Egl.h 23includes_HEADERS = Evas_Engine_Wayland_Egl.h
24includesdir = $(includedir)/evas-@VMAJ@ 24includesdir = $(includedir)/evas-@VMAJ@
diff --git a/legacy/evas/src/modules/loaders/bmp/Makefile.am b/legacy/evas/src/modules/loaders/bmp/Makefile.am
index 9cded273ec..0a04790fe1 100644
--- a/legacy/evas/src/modules/loaders/bmp/Makefile.am
+++ b/legacy/evas/src/modules/loaders/bmp/Makefile.am
@@ -18,7 +18,7 @@ pkg_LTLIBRARIES = module.la
18 18
19module_la_SOURCES = evas_image_load_bmp.c 19module_la_SOURCES = evas_image_load_bmp.c
20 20
21module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la 21module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ -lm $(top_builddir)/src/lib/libevas.la
22module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 22module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
23module_la_LIBTOOLFLAGS = --tag=disable-static 23module_la_LIBTOOLFLAGS = --tag=disable-static
24 24