summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2013-01-22 23:48:04 +0000
committerCarsten Haitzler <raster@rasterman.com>2013-01-22 23:48:04 +0000
commit64c4f34bc061dfb728037f77c069533705fa4b9c (patch)
tree508c856ec90276e119200a33049dc82186710caf /m4
parentf19ff1481a14b1901702ffdd93ad2b59e5531f2b (diff)
sorry - have to revert this as this brings the efl tree build to a
grinding halt - it wasn't great before.. but now it's totally broken. :( e.g.: /bin/bash ../libtool --tag=CC --mode=link ccache gcc -std=gnu99 -O2 -g -pipe -march=native -fvisibility=hidden -ffast-math -W -Wall -Wextra -Wno-shadow -Wno-unused-but-set-parameter -o bin/eet/eet bin/eet/bin_eet_eet-eet_main.o -fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries lib/eet/libeet.la libtool: link: ccache gcc -std=gnu99 -O2 -g -pipe -march=native -fvisibility=hidden -ffast-math -W -Wall -Wextra -Wno-shadow -Wno-unused-but-set-parameter -o bin/eet/.libs/eet bin/eet/bin_eet_eet-eet_main.o -fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries lib/eet/.libs/libeet.so /usr/bin/ld: bin/eet/bin_eet_eet-eet_main.o: undefined reference to symbol 'eina_iterator_next' /usr/bin/ld: note: 'eina_iterator_next' is defined in DSO /usr/local/lib/libeina.so.1 so try adding it to the linker command line /usr/local/lib/libeina.so.1: could not read symbols: Invalid operation collect2: ld returned 1 exit status SVN revision: 83112
Diffstat (limited to 'm4')
-rw-r--r--m4/efl.m48
1 files changed, 4 insertions, 4 deletions
diff --git a/m4/efl.m4 b/m4/efl.m4
index 97b1583..cd730b3 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -288,9 +288,9 @@ dnl PKG_INTERNAL_LIBS: all other EFL as lib/name/libname.la that this
288dnl package depend. Used in automake's _DEPENDENCIES. 288dnl package depend. Used in automake's _DEPENDENCIES.
289dnl 289dnl
290dnl USE_PKG_LIBS: what to use in automake's _LIBADD or _LDADD when using 290dnl USE_PKG_LIBS: what to use in automake's _LIBADD or _LDADD when using
291dnl this PKG (libpkg.la and public dependencies) 291dnl this PKG (PKG_LIBS + libpkg.la)
292dnl 292dnl
293dnl USE_PKG_INTERNAL_LIBS: lib/pkg/libpkg.la 293dnl USE_PKG_INTERNAL_LIBS: extends PKG_INTERNAL_LIBS with lib/pkg/libpkg.la
294dnl 294dnl
295dnl requirements_pc_pkg: all pkg-config (pc) files used by this pkg, 295dnl requirements_pc_pkg: all pkg-config (pc) files used by this pkg,
296dnl includes internal EFL (used in 'Requires.private' in pkg.pc) 296dnl includes internal EFL (used in 'Requires.private' in pkg.pc)
@@ -366,8 +366,8 @@ esac
366m4_defn([UP])_LDFLAGS="${EFL_COV_LDFLAGS} ${EFL_LDFLAGS} ${m4_defn([UP])_LDFLAGS}" 366m4_defn([UP])_LDFLAGS="${EFL_COV_LDFLAGS} ${EFL_LDFLAGS} ${m4_defn([UP])_LDFLAGS}"
367m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFL_COV_LIBS} ${EFL_LIBS} ${m4_defn([UP])_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])} ${requirements_internal_deps_libs_[]m4_defn([DOWN])} ${requirements_public_libs_[]m4_defn([DOWN])} ${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_efl} " 367m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFL_COV_LIBS} ${EFL_LIBS} ${m4_defn([UP])_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])} ${requirements_internal_deps_libs_[]m4_defn([DOWN])} ${requirements_public_libs_[]m4_defn([DOWN])} ${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_efl} "
368m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}" 368m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
369USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LDFLAGS} ${EFL_COV_LIBS} ${EFL_LIBS} lib/${libdirname}/lib${libname}.la ${requirements_public_libs_[]m4_defn([DOWN])} ${requirements_libs_efl}" 369USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
370USE_[]m4_defn([UP])_INTERNAL_LIBS="lib/${libdirname}/lib${libname}.la" 370USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la ${requirements_internal_deps_libs_[]m4_defn([DOWN])}"
371m4_defn([UP])_CFLAGS="${EFL_COV_CFLAGS} ${EFL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl} -DEFL_[]m4_defn([UP])_BUILD=1" 371m4_defn([UP])_CFLAGS="${EFL_COV_CFLAGS} ${EFL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl} -DEFL_[]m4_defn([UP])_BUILD=1"
372requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}" 372requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}"
373requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}" 373requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}"