enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

Add patch from bug #479 

Eina installs its modules in /usr/lib/eina/mp/<module>.so, which makes it impossible to install two different versions of eina at the same time. Please consider using something to make this path specific to a particular release of eina, just as you do for the include files.

SVN revision: 45562
This commit is contained in:
Sebastian Dransfeld 2010-01-25 19:07:52 +00:00
parent be64dad971
commit 0ba3822213
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/eina/configure.ac
View File

@ -24,6 +24,7 @@ VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
AC_DEFINE_UNQUOTED(VMAJ, ["$VMAJ"], [Eina major version number])
AC_SUBST(VMAJ)
AC_SUBST(version_info)

8
legacy/eina/src/lib/eina_mempool.c
View File

@ -165,17 +165,17 @@ eina_mempool_init(void)
_backends = eina_hash_string_superfast_new(NULL);
/* dynamic backends */
_modules = eina_module_list_get(NULL, PACKAGE_LIB_DIR "/eina/mp/", 0, NULL, NULL);
_modules = eina_module_list_get(NULL, PACKAGE_LIB_DIR "/eina-"VMAJ"/mp/", 0, NULL, NULL);
path = eina_module_environment_path_get("HOME", "/.eina/mp/");
path = eina_module_environment_path_get("HOME", "/.eina-"VMAJ"/mp/");
_modules = eina_module_list_get(_modules, path, 0, NULL, NULL);
if (path) free(path);
path = eina_module_environment_path_get("EINA_MODULES_MEMPOOL_DIR", "/eina/mp/");
path = eina_module_environment_path_get("EINA_MODULES_MEMPOOL_DIR", "/eina-"VMAJ"/mp/");
_modules = eina_module_list_get(_modules, path, 0, NULL, NULL);
if (path) free(path);
path = eina_module_symbol_path_get(eina_init, "/eina/mp/");
path = eina_module_symbol_path_get(eina_init, "/eina-"VMAJ"/mp/");
_modules = eina_module_list_get(_modules, path, 0, NULL, NULL);
if (path) free(path);

2
legacy/eina/src/modules/mp/chained_pool/Makefile.am
View File

@ -10,7 +10,7 @@ AM_CPPFLAGS = \
if EINA_BUILD_CHAINED_POOL
if !EINA_STATIC_BUILD_CHAINED_POOL
controllerdir = $(libdir)/eina/mp
controllerdir = $(libdir)/eina-$(VMAJ)/mp
controller_LTLIBRARIES = eina_chained_mempool.la
eina_chained_mempool_la_SOURCES = \

2
legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am
View File

@ -12,7 +12,7 @@ AM_CPPFLAGS = \
if EINA_BUILD_EMEMOA_FIXED
if !EINA_STATIC_BUILD_EMEMOA_FIXED
controllerdir = $(libdir)/eina/mp
controllerdir = $(libdir)/eina-$(VMAJ)/mp
controller_LTLIBRARIES = eina_ememoa_fixed.la
eina_ememoa_fixed_la_SOURCES = \

2
legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am
View File

@ -12,7 +12,7 @@ AM_CPPFLAGS = \
if EINA_BUILD_EMEMOA_UNKNOWN
if !EINA_STATIC_BUILD_EMEMOA_UNKNOWN
controllerdir = $(libdir)/eina/mp
controllerdir = $(libdir)/eina-$(VMAJ)/mp
controller_LTLIBRARIES = eina_ememoa_unknown.la
eina_ememoa_unknown_la_SOURCES = \

2
legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am
View File

@ -11,7 +11,7 @@ AM_CPPFLAGS = \
if EINA_BUILD_FIXED_BITMAP
if !EINA_STATIC_BUILD_FIXED_BITMAP
controllerdir = $(libdir)/eina/mp
controllerdir = $(libdir)/eina-$(VMAJ)/mp
controller_LTLIBRARIES = eina_fixed_bitmap.la
eina_fixed_bitmap_la_SOURCES = \

2
legacy/eina/src/modules/mp/pass_through/Makefile.am
View File

@ -11,7 +11,7 @@ AM_CPPFLAGS = \
if EINA_BUILD_PASS_THROUGH
if !EINA_STATIC_BUILD_PASS_THROUGH
controllerdir = $(libdir)/eina/mp
controllerdir = $(libdir)/eina-$(VMAJ)/mp
controller_LTLIBRARIES = eina_pass_through.la
eina_pass_through_la_SOURCES = \