From 0ba382221357ebb6ffe60b49cb0d3f444ac38e0b Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Mon, 25 Jan 2010 19:07:52 +0000 Subject: [PATCH] Add patch from bug #479 Eina installs its modules in /usr/lib/eina/mp/.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 --- legacy/eina/configure.ac | 1 + legacy/eina/src/lib/eina_mempool.c | 8 ++++---- legacy/eina/src/modules/mp/chained_pool/Makefile.am | 2 +- legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am | 2 +- legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am | 2 +- legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am | 2 +- legacy/eina/src/modules/mp/pass_through/Makefile.am | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac index 1be6fe2990..21d555c6a2 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/configure.ac @@ -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) diff --git a/legacy/eina/src/lib/eina_mempool.c b/legacy/eina/src/lib/eina_mempool.c index 83d2795ae8..253b291d74 100644 --- a/legacy/eina/src/lib/eina_mempool.c +++ b/legacy/eina/src/lib/eina_mempool.c @@ -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); diff --git a/legacy/eina/src/modules/mp/chained_pool/Makefile.am b/legacy/eina/src/modules/mp/chained_pool/Makefile.am index f14f7e34bd..5983ac537c 100644 --- a/legacy/eina/src/modules/mp/chained_pool/Makefile.am +++ b/legacy/eina/src/modules/mp/chained_pool/Makefile.am @@ -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 = \ diff --git a/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am b/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am index ff5b57f3a9..da038710c9 100644 --- a/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am +++ b/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am @@ -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 = \ diff --git a/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am b/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am index 879d8ce644..3aff35f4f4 100644 --- a/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am +++ b/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am @@ -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 = \ diff --git a/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am b/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am index eaad65f176..aad8dfc1a5 100644 --- a/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am +++ b/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am @@ -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 = \ diff --git a/legacy/eina/src/modules/mp/pass_through/Makefile.am b/legacy/eina/src/modules/mp/pass_through/Makefile.am index 4ce8f3736b..3bf94ab976 100644 --- a/legacy/eina/src/modules/mp/pass_through/Makefile.am +++ b/legacy/eina/src/modules/mp/pass_through/Makefile.am @@ -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 = \