[patch] this patch works

portage.patch (text/plain), 2.19 KB, created by Brad House on 2003-11-11 16:24:03 UTC

diff -ruN portage-2.0.49-r15/src/sandbox-1.1/Makefile portage-2.0.49-r15.old/src/sandbox-1.1/Makefile
--- portage-2.0.49-r15/src/sandbox-1.1/Makefile	2003-07-30 04:05:52.000000000 -0400
+++ portage-2.0.49-r15.old/src/sandbox-1.1/Makefile	2003-11-11 19:30:57.412679992 -0500
@@ -20,7 +20,14 @@
 LDFLAGS =
 DESTDIR =
 
-TARGETS = libsandbox.so sandbox
+CHECK_ARCH64=$(shell ls -ld $(ROOT)/lib32 2>/dev/null)
+
+ifneq ($(CHECK_ARCH64),)
+  TARGETS = libsandbox.so libsandbox32.so sandbox
+  OBJ_DEFINES +=  -DSB_HAVE_64BIT_ARCH
+else
+  TARGETS = libsandbox.so sandbox
+endif
 
 all:	$(TARGETS)
 
@@ -39,15 +46,26 @@
 libsandbox.o: libsandbox.c localdecls.h canonicalize.c getcwd.c
 	$(CC) $(CFLAGS) -Wall -c $(OBJ_DEFINES) libsandbox.c
 
+sandbox_futils32.o: sandbox_futils.c sandbox.h
+	$(CC) $(CFLAGS) -Wall -c -m32 $(OBJ_DEFINES) sandbox_futils.c -o $@
+
+libsandbox32.so: libsandbox32.o sandbox_futils32.o
+	$(CC) $^ -shared -fPIC -ldl -lc -m32 -o $@ -nostdlib -lgcc
+
+libsandbox32.o: libsandbox.c localdecls.h canonicalize.c getcwd.c
+	$(CC) $(CFLAGS) -Wall -c -m32 $(OBJ_DEFINES) libsandbox.c -o $@
+
 localdecls.h: create-localdecls libctest.c
 	./create-localdecls
 
 
 install: all
 	install -d -m 0755 $(DESTDIR)/lib
+	$(if $(CHECK_ARCH64),install -d -m 0755 $(DESTDIR)/lib32)
 	install -d -m 0755 $(DESTDIR)/usr/lib/portage/bin
 	install -d -m 0755 $(DESTDIR)/usr/lib/portage/lib
 	install -m 0755 libsandbox.so $(DESTDIR)/lib
+	$(if $(CHECK_ARCH64),install -m 0755 libsandbox32.so $(DESTDIR)/lib32/libsandbox.so)
 	install -m 0755 sandbox $(DESTDIR)/usr/lib/portage/bin
 	install -m 0644 sandbox.bashrc $(DESTDIR)/usr/lib/portage/lib
 
diff -ruN portage-2.0.49-r15/src/sandbox-1.1/sandbox_futils.c portage-2.0.49-r15.old/src/sandbox-1.1/sandbox_futils.c
--- portage-2.0.49-r15/src/sandbox-1.1/sandbox_futils.c	2003-10-02 17:07:22.000000000 -0400
+++ portage-2.0.49-r15.old/src/sandbox-1.1/sandbox_futils.c	2003-11-11 19:17:11.509236400 -0500
@@ -57,10 +57,14 @@
 {
 	char path[255];
 
+#ifdef SB_HAVE_64BIT_ARCH
+        snprintf(path, 254, "%s", LIB_NAME);
+#else
 	snprintf(path, 254, "/lib/%s", LIB_NAME);
 	if (file_exist(path, 0) <= 0) {
 		snprintf(path, 254, "%s%s", sb_path, LIB_NAME);
 	}
+#endif
 	return (strdup(path));
 }