merge: -Wl,--enable-auto-import is useless with recent versions of gcc on Windows

SVN revision: 78495
This commit is contained in:
Vincent Torri 2012-10-25 22:01:28 +00:00
parent c636562644
commit aac3e95ccf
9 changed files with 83 additions and 24 deletions

View File

@ -55,33 +55,98 @@ requirements_libs_evil=""
requirements_libs_eina=""
requirements_libs_eo=""
requirements_libs_eet=""
#requirements_libs_evas=""
#requirements_libs_ecore=""
#requirements_libs_embryo=""
#requirements_libs_eio=""
#requirements_libs_edje=""
#requirements_libs_efreet=""
#requirements_libs_e_dbus=""
#requirements_libs_eeze=""
#requirements_libs_emotion=""
#requirements_libs_ethumb=""
#requirements_libs_elementary=""
requirements_libs_deps_evil=""
requirements_libs_deps_eina=""
requirements_libs_deps_eo=""
requirements_libs_deps_eet=""
#requirements_libs_deps_evas=""
#requirements_libs_deps_ecore=""
#requirements_libs_deps_embryo=""
#requirements_libs_deps_eio=""
#requirements_libs_deps_edje=""
#requirements_libs_deps_efreet=""
#requirements_libs_deps_e_dbus=""
#requirements_libs_deps_eeze=""
#requirements_libs_deps_emotion=""
#requirements_libs_deps_ethumb=""
#requirements_libs_deps_elementary=""
requirements_pc_eina=""
requirements_pc_eo=""
requirements_pc_eet=""
#requirements_pc_evas=""
#requirements_pc_ecore=""
#requirements_pc_embryo=""
#requirements_pc_eio=""
#requirements_pc_edje=""
#requirements_pc_efreet=""
#requirements_pc_e_dbus=""
#requirements_pc_eeze=""
#requirements_pc_emotion=""
#requirements_pc_ethumb=""
#requirements_pc_elementary=""
requirements_pc_deps_eina=""
requirements_pc_deps_eo=""
requirements_pc_deps_eet=""
#requirements_pc_deps_evas=""
#requirements_pc_deps_ecore=""
#requirements_pc_deps_embryo=""
#requirements_pc_deps_eio=""
#requirements_pc_deps_edje=""
#requirements_pc_deps_efreet=""
#requirements_pc_deps_e_dbus=""
#requirements_pc_deps_eeze=""
#requirements_pc_deps_emotion=""
#requirements_pc_deps_ethumb=""
#requirements_pc_deps_elementary=""
AC_SUBST([requirements_libs_evil])
AC_SUBST([requirements_libs_eina])
AC_SUBST([requirements_libs_eo])
AC_SUBST([requirements_libs_eet])
#AC_SUBST([requirements_libs_evas])
#AC_SUBST([requirements_libs_ecore])
#AC_SUBST([requirements_libs_embryo])
#AC_SUBST([requirements_libs_eio])
#AC_SUBST([requirements_libs_edje])
#AC_SUBST([requirements_libs_efreet])
#AC_SUBST([requirements_libs_e_dbus])
#AC_SUBST([requirements_libs_eeze])
#AC_SUBST([requirements_libs_emotion])
#AC_SUBST([requirements_libs_ethumb])
#AC_SUBST([requirements_libs_elementary])
AC_SUBST([requirements_pc_eina])
AC_SUBST([requirements_pc_eo])
AC_SUBST([requirements_pc_eet])
#AC_SUBST([requirements_pc_evas])
#AC_SUBST([requirements_pc_ecore])
#AC_SUBST([requirements_pc_embryo])
#AC_SUBST([requirements_pc_eio])
#AC_SUBST([requirements_pc_edje])
#AC_SUBST([requirements_pc_efreet])
#AC_SUBST([requirements_pc_e_dbus])
#AC_SUBST([requirements_pc_eeze])
#AC_SUBST([requirements_pc_emotion])
#AC_SUBST([requirements_pc_ethumb])
#AC_SUBST([requirements_pc_elementary])
AC_CANONICAL_HOST
# TODO: move me to m4 file that setups module/so related variables
have_wince="no"
have_win32="no"
@ -93,12 +158,18 @@ case "$host_os" in
mingw32ce*)
have_wince="yes"
have_windows="yes"
want_efreet="no"
want_e_dbus="no"
want_eeze="no"
want_emotion="no"
want_ethumb="no"
MODULE_ARCH="$host_os-$host_cpu"
MODULE_EXT=".dll"
;;
mingw*)
have_win32="yes"
have_windows="yes"
want_eeze="no"
MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic"
MODULE_EXT=".dll"
;;
@ -134,6 +205,8 @@ case "${build_profile}" in
;;
esac
# TODO: add some build "profile" (server, full, etc...)
#### Checks for programs
@ -230,17 +303,6 @@ AC_C_INLINE
#### Checks for linker characteristics
# TODO: do we really need this? maybe setup in the specific m4 file that
# does the windows related variables? Do we need to manually specify this
# for every module? it's annoying and easy to forget!
lt_enable_auto_import=""
case "${host_os}" in
mingw*)
lt_enable_auto_import="-Wl,--enable-auto-import"
;;
esac
AC_SUBST([lt_enable_auto_import])
#### Checks for library functions
@ -539,6 +601,7 @@ EINA_CHECK_MODULE([one-big], [static], [one big])
#### Eet
AC_MSG_NOTICE([Eet checks])
### Default values
@ -642,6 +705,7 @@ fi
# libjpeg and zlib
EFL_CHECK_LIBS([EET], [libjpeg zlib])
# TODO: better way to force those instead of is secondary check
if test "x${efl_lib_zlib}" != "xyes" -o "x${efl_lib_libjpeg}" != "xyes" ; then
AC_MSG_ERROR([Required EET libraries were not found.])
@ -658,12 +722,10 @@ PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}])
case "$host_os" in
mingw32ce*)
# TODO: are these needed here? parts of this are replicated for EVERY LIB :-(
requirements_libs_eet="${requirements_libs_eet} -lws2"
requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2"
;;
mingw*)
# TODO: are these needed here? parts of this are replicated for EVERY LIB :-(
requirements_libs_eet="${requirements_libs_eet} -lws2_32"
requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2_32"
;;
@ -687,7 +749,6 @@ case "${host_os}" in
openbsd*)
;;
*)
# TODO: here? Why don't do everywhere or let user specify it?
EFL_CHECK_LINKER_FLAGS([EET], [-Wl,--as-needed])
;;
esac

View File

@ -28,5 +28,3 @@ eet_LDADD += $(top_builddir)/src/lib/evil/libdl.la
endif
eet_LDADD += @EET_LIBS@
eet_LDFLAGS = @lt_enable_auto_import@

View File

@ -48,7 +48,7 @@ endif
libeet_la_LIBADD += @EET_LIBS@ -lm
libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
EXTRA_DIST = lz4/README

View File

@ -196,7 +196,7 @@ endif
libeina_la_LIBADD += -lm
libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
clean-local:
rm -rf *.gcno

View File

@ -22,7 +22,7 @@ lib_LTLIBRARIES = libeo.la
libeo_la_SOURCES = eo.c eo_base_class.c eo_private.h
libeo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EO_LIBS@
libeo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
libeo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
clean-local:
rm -rf *.gcno

View File

@ -14,7 +14,7 @@ module_la_SOURCES = eina_chained_mempool.c
module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version @EFL_PTHREAD_LIBS@
module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@
module_la_LIBTOOLFLAGS = --tag=disable-static
install-data-hook:

View File

@ -14,7 +14,7 @@ module_la_SOURCES = eina_one_big.c
module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version @EFL_PTHREAD_LIBS@
module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@
module_la_LIBTOOLFLAGS = --tag=disable-static
install-data-hook:

View File

@ -13,7 +13,7 @@ module_la_SOURCES = eina_pass_through.c
module_la_CFLAGS = @EINA_CFLAGS@
module_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
module_la_LDFLAGS = -no-undefined -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
install-data-hook:

View File

@ -64,7 +64,7 @@ module_dummy_la_SOURCES = eina_test_module_dummy.c
module_dummy_la_CPPFLAGS = $(AM_CPPFLAGS) -DEFL_EINA_BUILD
module_dummy_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@ -lm
module_dummy_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
module_dummy_la_LDFLAGS = -no-undefined -module -avoid-version
module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
endif