aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNicholas Jones <carpaski@gentoo.org>2004-08-16 08:19:38 +0000
committerNicholas Jones <carpaski@gentoo.org>2004-08-16 08:19:38 +0000
commitecc2faaa00b1e6250129267ba873bedd2121eac5 (patch)
treed391a4b12c759f61ab90519a2d396b8bfe80f684 /src
parentreversed it. doesn't solve the issue for xmllint versions less then 20600, s... (diff)
downloadportage-cvs-ecc2faaa00b1e6250129267ba873bedd2121eac5.tar.gz
portage-cvs-ecc2faaa00b1e6250129267ba873bedd2121eac5.tar.bz2
portage-cvs-ecc2faaa00b1e6250129267ba873bedd2121eac5.zip
GPG work, CONF_LIBDIR, and stuff. Portage-2.0.51_pre18 finialization
Diffstat (limited to 'src')
-rw-r--r--src/sandbox-1.1/sandbox.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/sandbox-1.1/sandbox.c b/src/sandbox-1.1/sandbox.c
index ecbfd46..9814a7e 100644
--- a/src/sandbox-1.1/sandbox.c
+++ b/src/sandbox-1.1/sandbox.c
@@ -11,7 +11,7 @@
** Copyright (C) 2001 Geert Bevin, Uwyn, http://www.uwyn.com
** Distributed under the terms of the GNU General Public License, v2 or later
** Author : Geert Bevin <gbevin@uwyn.com>
-** $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/sandbox.c,v 1.17 2004/04/11 10:18:05 carpaski Exp $
+** $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/sandbox.c,v 1.18 2004/08/16 08:19:38 carpaski Exp $
*/
/* #define _GNU_SOURCE */
@@ -323,10 +323,18 @@ setenv_sandbox_write(char *home_dir, char *portage_tmp_dir, char *var_tmp_dir,
strcat(sandbox_write_var, ":");
strcat(sandbox_write_var, "/usr/lib/conftest");
strcat(sandbox_write_var, ":");
+ strcat(sandbox_write_var, "/usr/lib32/conftest");
+ strcat(sandbox_write_var, ":");
+ strcat(sandbox_write_var, "/usr/lib64/conftest");
+ strcat(sandbox_write_var, ":");
strcat(sandbox_write_var, "/usr/tmp/cf");
strcat(sandbox_write_var, ":");
strcat(sandbox_write_var, "/usr/lib/cf");
strcat(sandbox_write_var, ":");
+ strcat(sandbox_write_var, "/usr/lib32/cf");
+ strcat(sandbox_write_var, ":");
+ strcat(sandbox_write_var, "/usr/lib64/cf");
+ strcat(sandbox_write_var, ":");
if (NULL == portage_tmp_dir) {
strcat(sandbox_write_var, tmp_dir);
strcat(sandbox_write_var, ":");
@@ -387,6 +395,12 @@ setenv_sandbox_predict(char *home_dir)
strcat(sandbox_predict_var, "/usr/lib/python2.2/");
strcat(sandbox_predict_var, ":");
strcat(sandbox_predict_var, "/usr/lib/python2.3/");
+ strcat(sandbox_predict_var, ":");
+ strcat(sandbox_predict_var, "/usr/lib/python2.4/");
+ strcat(sandbox_predict_var, ":");
+ strcat(sandbox_predict_var, "/usr/lib/python2.5/");
+ strcat(sandbox_predict_var, ":");
+ strcat(sandbox_predict_var, "/usr/lib/python3.0/");
setenv(ENV_SANDBOX_PREDICT, sandbox_predict_var, 1);
}
}