Commit Graph

23 Commits

Author SHA1 Message Date
Tom Hacohen bc1ec328d3 Fix revision fetching when not using git. 2013-03-01 17:02:10 +00:00
Tom Hacohen 3a69dfcca1 Efl: Use git rev-list in order to get version instead of svnversion. 2013-02-15 16:13:50 +00:00
Carsten Haitzler 64c4f34bc0 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
2013-01-22 23:48:04 +00:00
Gustavo Sverzut Barbieri e532627b9f try to simplify internal library dependency.
Just use the lib/name/libname.la as libtool should be responsible to
emit dependencies to compiler when it evaluates.

This should reduce over-linking, also reducing the compile lines in
our verbose builds ;-)

NOTE: this seems to work on Fedora 18 (which also bitch about DSO), so
hopefully works on Debian and Ubuntu (and elsewhere).

Please revert if breaks builds!



SVN revision: 83105
2013-01-22 21:58:25 +00:00
Gustavo Sverzut Barbieri e2e25b3d3d fix flags and libs ordering.
linker (ld) is that kind of tool that argument order matters, if you
-Wl,--as-needed, it will be worth just for libraries following
it. Then we need to use EFL_LDFLAGS before everything else, otherwise
it end being useless.



SVN revision: 82991
2013-01-18 18:51:16 +00:00
Gustavo Sverzut Barbieri db38bdd6de cosmetic: simplify and colorize features.
EFL_ADD_FEATURE(PKG, NAME, [VALUE]) will do an amazing work to produce
colored output in a standard way.

if value == yes, it's green and shows "+name"
if value == no, it's red and shows "-name"
else it shows cyan and shows "name=value"

if not provided, will use ${have_name:-${want_name}}



SVN revision: 82976
2013-01-18 13:48:14 +00:00
Boris Faure ac4df627f7 efl: export vmin/vmic in edje.pc
It is used to know where to install external modules.

SVN revision: 82974
2013-01-18 13:01:36 +00:00
Gustavo Sverzut Barbieri 12a0f9388a clean some whitelines from already lengthly configure file.
SVN revision: 82951
2013-01-17 20:58:07 +00:00
Gustavo Sverzut Barbieri 88f2d26608 don't mix private and public libraries dependencies.
when I fixed eina's dependency on -lpthread I used all the libraries
eina links to. But we should just do with -lpthread as it's a public
dependency... that was in eina.pc.in and I missed.

Now we have EFL_ADD_PUBLIC_LIBS() that will register for
requirements_public_libs_name and use internally when eina is used.

This should also fix the problem by Arvind with gcrypt.



SVN revision: 82942
2013-01-17 18:55:32 +00:00
Cedric BAIL 098a745c4b efl: revert r82914 which was a revert of r82909.
SVN revision: 82915
2013-01-17 02:35:29 +00:00
Cedric BAIL 0bcbfcf4c1 efl: revert r82909 as it break build.
Symptom are dependencies is full of -lm -lrt -lsomething that can't
be found in the Makefile target.


SVN revision: 82914
2013-01-17 01:52:32 +00:00
Gustavo Sverzut Barbieri 2554b34a92 fix internal library linkage to pull in dependencies.
some libraries will need to pull more than its own .so, for example
Eina.h includes eina_lock.h that includes eina_inline_lock_posix.x
that will use pthread calls directly from user code.

This was already listed in eina.pc, but not being present in
USE_EINA_LIBS.



SVN revision: 82909
2013-01-16 21:25:58 +00:00
Gustavo Sverzut Barbieri ad1417713b simplify efl version and initialization in a macro, fixes libtool version-info.
Introduces EFL_VERSION() to make it simpler to define our version. The
last parameter is the release status, defaults to 'dev' for
development purposes and may be set to something else to be a
snapshot. It non-empty will be given to libtool's -release.

As EFL_VERSION() must be done *before* AC_INIT(), we need to create
another macro to do the AC_SUBST() and AC_DEFINE(). This is
EFL_INIT. And no, we can't just call AC_INIT() from inside EFL_INIT().

Last but not least, we had a problem with our libtool version-info. It
was being calculated as MAJOR + MINOR, right now 1 + 7 = 8. But as
soon as we get to MAJOR=2 and MINOR=0, we get into problems. This was
fixed by rewriting as (MAJOR * 100 + MINOR), but this is still
problematic.

According to libtool's manual (info libtool), we shouldn't bind the
version-info with package info, instead doing the 'release'
field. Pretty likely we'll do worse than expected by distros and
binary packages in future :-/




SVN revision: 82891
2013-01-16 17:24:36 +00:00
Gustavo Sverzut Barbieri 720a81d58c move ecore_imf_evas out of ecore_imf.
SVN revision: 82837
2013-01-15 19:11:01 +00:00
Gustavo Sverzut Barbieri c4e163fe4a move ecore_input_evas out of ecore_input.
we don't need this mess anymore :-P



SVN revision: 82836
2013-01-15 18:59:28 +00:00
Gustavo Sverzut Barbieri d97c63e4c6 fix directory structure: move ethumd_client out of ethumb.
it's another library, do not mix stuff as it used to be.




SVN revision: 82835
2013-01-15 18:10:58 +00:00
Gustavo Sverzut Barbieri b1bc5aeb24 efl: simplify automake.
Instead of -I$(top_srcdir)... -I$(top_builddir)... and then do it for
the .la, use the EFL_ macros to generate the contents to be used in
automake files.

There is a nasty bit that libtool will parse Makefile*.am and will not
get _DEPENDENCIES from _LIBADD and _LDADD if these are in
@REPLACEMENT@. To solve this we must explicitly set _DEPENDENCIES. The
contents of this is almost the same as _LIBADD or _LDADD with the
"_INTERNAL_" replacement name.

I hope the code will be result will be shorter and consistent as there
is less places to change when we add/remove dependencies.

Statistics are quite impressive (diffstat):
{{{
37 files changed, 663 insertions(+), 1599 deletions(-)
}}}



SVN revision: 82785
2013-01-14 22:36:23 +00:00
Gustavo Sverzut Barbieri 34f5315141 merge ethumb.
This one was a painful bitch. The edbus2 port was quite broken, mainly
leaking eina_stringshare and also not adding the '\0' to the strings
that are represented as bytearray (paths cannot be utf8 to avoid
translations).

Emotion plugin was also quite bogus and the video thumbnail as edje
(animated) is not working yet due bug in Edje_Edit api -- someone
needs to investigate this, seems strange.

Emotion plugin also had a bug that it was deleting the object from
inside object callback.

Now it seems to work. Please report if it does not.



SVN revision: 82675
2013-01-12 01:15:45 +00:00
Gustavo Sverzut Barbieri 68188ac0c8 efl: merge eeze.
Changes also in this commit:
 * fix missing EAPI in symbols used by modules
 * removed old libudev and libmount support as agreed by discomfitor/zmike
 * replaced __UNUSED__ with EINA_UNUSED
 * fixed docs hierarchy



SVN revision: 82100
2013-01-03 20:37:42 +00:00
Gustavo Sverzut Barbieri df1b3d30c4 efl: refactor CFLAGS, LIBS, LIBADD and LDADD usage.
- remove EFL_LIBS and EFL_CFLAGS, use per-lib values that inherit
   from EFL (general)

 - add NAME_LDFLAGS and EFL_LDFLAGS for linker flags.

 - LDADD (binaries) now use NAME_LDFLAGS instead of NAME_LIBS, as they
   link to libname.la and that will pull in the libtool dependencies



SVN revision: 81915
2012-12-31 00:46:14 +00:00
Gustavo Sverzut Barbieri 1f423eb8e7 efl/configure: simplify configure.ac
more macros to aid common tasks, make it easier to read.



SVN revision: 81904
2012-12-30 18:08:55 +00:00
Gustavo Sverzut Barbieri fb27484376 efl/configure: simplify lib declaration.
added couple of macros:

 - EFL_LIB_START(PKG): setup variables and replacements (AC_SUBST),
   prints started checks
 - EFL_LIB_END(PKG): prints ended checks

 - EFL_LIB_START_OPTIONAL(PKG, TEST): wraps EFL_LIB_START() with a
   conditional test. defines AC_DEFINE(HAVE_PKG).
 - EFL_LIB_END_OPTIONAL(PKG): wraps EFL_LIB_END() with a conditional
   test, defines AM_CONDITIONAL(HAVE_PKG).



SVN revision: 81903
2012-12-30 15:21:33 +00:00
Gustavo Sverzut Barbieri 4476601805 efl: m4 is a macro-expansion language, use that.
instead of replicating common patterns all around, let's use the
common patterns as m4 macros.

EFL_DEPEND_PKG() will use pkg-config and add the dependency.

EFL_OPTIONAL_DEPEND_PKG() will use the former, but also defines
have_XYZ and does the if statement for you.



SVN revision: 80402
2012-12-06 23:19:35 +00:00