kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix problem in dealing with debians multiarch on prefix finding. 

SVN revision: 74709
This commit is contained in:
Carsten Haitzler 2012-08-01 06:28:37 +00:00
parent 102a85cc6e
commit 7150d2f266
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/eina/ChangeLog
View File

@ -314,3 +314,9 @@
2012-07-05 Raphael Kubo da Costa
* Handle NULL in all eina_*_free function.
2012-08-01 Carsten Haitzler (The Rasterman)
* Modify eina_prefix to deal with debian's fun new
multiarch... if you are a shared library.

19
legacy/eina/src/lib/eina_prefix.c
View File

@ -578,6 +578,9 @@ eina_prefix_new(const char *argv0, void *symbol, const char *envprefix,
* bin_dir = /blah/whatever/bin
* data_dir = /blah/whatever/share/enlightenment
* lib_dir = /blah/whatever/lib
*
* new case - debian multiarch goop.
* exe = /blah/whatever/lib/arch/libexe.so
*/
DBG("From exe %s figure out the rest", pfx->exe_path);
p = strrchr(pfx->exe_path, DSEP_C);
@ -633,6 +636,22 @@ eina_prefix_new(const char *argv0, void *symbol, const char *envprefix,
/* magic file not there. time to start hunting! */
else
{
if (buf[0])
{
for (;p > pfx->exe_path; p--)
{
if (*p == DSEP_C)
{
p--;
break;
}
}
if (p > pfx->exe_path)
{
continue;
DBG("Go back one directory");
}
}
WRN("Magic failed");
_fallback(pfx, pkg_bin, pkg_lib, pkg_data,
pkg_locale, envprefix);