Package: fakeroot
Version: 1.2.10-0.0.0.1.pure64
Followup-For: Bug #292505
Hi,
attached the patch for biarch (adds 32bit) support on amd64.
MfG
Goswin
-- System Information:
Debian Release: 3.1
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.8-frosties-1
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
Versions of packages fakeroot depends on:
ii libc6 2.3.2.ds1-21 GNU C Library: Shared libraries an
-- no debconf information
diff -Nru /tmp/YLVjcRiuol/fakeroot-1.2.10/debian/changelog
/tmp/tnScTxVeeC/fakeroot-1.2.10/debian/changelog
--- /tmp/YLVjcRiuol/fakeroot-1.2.10/debian/changelog 2005-04-23
16:52:59.000000000 +0200
+++ /tmp/tnScTxVeeC/fakeroot-1.2.10/debian/changelog 2005-05-08
20:17:09.000000000 +0200
@@ -1,3 +1,9 @@
+fakeroot (1.2.10-0.0.0.1.pure64) unstable; urgency=low
+
+ * Extend biarch support to include 32bit on amd64
+
+ -- Goswin von Brederlow <[EMAIL PROTECTED]> Sun, 8 May 2005 20:14:07 +0200
+
fakeroot (1.2.10) unstable; urgency=low
* Have fakeroot-tcp be a higher-priority alternative on the Hurd.
diff -Nru /tmp/YLVjcRiuol/fakeroot-1.2.10/debian/rules
/tmp/tnScTxVeeC/fakeroot-1.2.10/debian/rules
--- /tmp/YLVjcRiuol/fakeroot-1.2.10/debian/rules 2005-04-23
16:51:52.000000000 +0200
+++ /tmp/tnScTxVeeC/fakeroot-1.2.10/debian/rules 2005-05-08
20:08:12.000000000 +0200
@@ -23,6 +23,12 @@
INSTALL_PROGRAM += -s
endif
+ifeq (x86_64-linux,$(DEB_HOST_GNU_TYPE))
+BIARCH_LIB_DIR=emul/ia32-linux/usr/lib
+else
+BIARCH_LIB_DIR=usr/lib64
+endif
+
build: build-stamp
build-stamp:
@@ -56,7 +62,7 @@
-cd obj-tcp && $(MAKE) distclean
-cd objfake-sysv && $(MAKE) distclean
-cd objfake-tcp && $(MAKE) distclean
-ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux s390-linux))
+ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux s390-linux
x86_64-linux))
-cd obj64-sysv && $(MAKE) distclean
-cd obj64-tcp && $(MAKE) distclean
endif
@@ -110,7 +116,7 @@
rm debian/tmp/usr/lib/libfakeroot/libfakeroot.so
rm debian/tmp/usr/lib/libfakeroot.a
rm debian/tmp/usr/lib/libfakeroot.so
-ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux s390-linux))
+ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux s390-linux
x86_64-linux))
debian/rules binary-biarch
endif
$(INSTALL_FILE) debian/copyright
debian/tmp/usr/share/doc/fakeroot/copyright
@@ -169,33 +175,37 @@
cd obj64-sysv && CC="gcc -m64" ../configure --prefix=/usr
--mandir=/usr/share/man --build=s390-linux --host=s390x-linux
--program-suffix=-sysv $(CONFARGS)
cd obj64-tcp && CC="gcc -m64" ../configure --prefix=/usr
--mandir=/usr/share/man --build=s390-linux --host=s390x-linux --with-ipc=tcp
--program-suffix=-tcp $(CONFARGS)
endif
+ifeq (x86_64-linux,$(DEB_HOST_GNU_TYPE))
+ cd obj64-sysv && CC="gcc-3.4 -m32" ../configure --prefix=/usr
--mandir=/usr/share/man --build=x86_64-linux --host=i386-linux
--program-suffix=-sysv $(CONFARGS)
+ cd obj64-tcp && CC="gcc-3.4 -m32" ../configure --prefix=/usr
--mandir=/usr/share/man --build=x86_64-linux --host=i386-linux --with-ipc=tcp
--program-suffix=-tcp $(CONFARGS)
+endif
cd obj64-tcp && $(MAKE) libfakeroot.la
- $(INSTALL_DIR) debian/tmp/usr/lib64/libfakeroot
+ $(INSTALL_DIR) debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot
cd obj64-tcp && $(SHELL) ./libtool --mode=install install
libfakeroot.la \
- $(CURDIR)/debian/tmp/usr/lib64/libfakeroot/libfakeroot.la
- rm -f debian/tmp/usr/lib64/libfakeroot/libfakeroot.*a*
- mv debian/tmp/usr/lib64/libfakeroot/libfakeroot.so.0.0.1
debian/tmp/usr/lib64/libfakeroot/libfakeroot-tcp.so.0.0.1
- rm -f debian/tmp/usr/lib64/libfakeroot/libfakeroot.so.0
- ln -s libfakeroot-tcp.so.0.0.1
debian/tmp/usr/lib64/libfakeroot/libfakeroot-tcp.so.0
-# mv debian/tmp/usr/lib64/libfakeroot.so.0.0.1
debian/tmp/usr/lib64/libfakeroot-tcp.so.0.0.1
-# mv debian/tmp/usr/lib64/libfakeroot.so.0
debian/tmp/usr/lib64/libfakeroot-tcp.so.0
+
$(CURDIR)/debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot.la
+ rm -f debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot.*a*
+ mv debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot.so.0.0.1
debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot-tcp.so.0.0.1
+ rm -f debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot.so.0
+ ln -s libfakeroot-tcp.so.0.0.1
debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot-tcp.so.0
+# mv debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot.so.0.0.1
debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot-tcp.so.0.0.1
+# mv debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot.so.0
debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot-tcp.so.0
cd obj64-sysv && $(MAKE) libfakeroot.la
- $(INSTALL_DIR) debian/tmp/usr/lib64/libfakeroot
+ $(INSTALL_DIR) debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot
cd obj64-sysv && $(SHELL) ./libtool --mode=install install
libfakeroot.la \
- $(CURDIR)/debian/tmp/usr/lib64/libfakeroot/libfakeroot.la
-# cd obj64-sysv && ./libtool --finish
debian/fakeroot-sparc/usr/lib64/fakeroot
- rm -f debian/tmp/usr/lib64/libfakeroot/libfakeroot.*a*
- mv debian/tmp/usr/lib64/libfakeroot/libfakeroot.so.0.0.1
debian/tmp/usr/lib64/libfakeroot/libfakeroot-sysv.so.0.0.1
- rm -f debian/tmp/usr/lib64/libfakeroot/libfakeroot.so.0
- ln -s libfakeroot-sysv.so.0.0.1
debian/tmp/usr/lib64/libfakeroot/libfakeroot-sysv.so.0
+
$(CURDIR)/debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot.la
+# cd obj64-sysv && ./libtool --finish
debian/fakeroot-sparc/$(BIARCH_LIB_DIR)/fakeroot
+ rm -f debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot.*a*
+ mv debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot.so.0.0.1
debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot-sysv.so.0.0.1
+ rm -f debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot.so.0
+ ln -s libfakeroot-sysv.so.0.0.1
debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot-sysv.so.0
- rm debian/tmp/usr/lib64/libfakeroot/libfakeroot.so
-# rm debian/tmp/usr/lib64/libfakeroot.so
+ rm debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot.so
+# rm debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot.so
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- strip --remove-section=.comment --remove-section=.note --strip-unneeded
debian/tmp/usr/lib64/libfakeroot/libfakeroot-sysv.so.0.0.1
- strip --remove-section=.comment --remove-section=.note --strip-unneeded
debian/tmp/usr/lib64/libfakeroot/libfakeroot-tcp.so.0.0.1
+ strip --remove-section=.comment --remove-section=.note --strip-unneeded
debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot-sysv.so.0.0.1
+ strip --remove-section=.comment --remove-section=.note --strip-unneeded
debian/tmp/$(BIARCH_LIB_DIR)/libfakeroot/libfakeroot-tcp.so.0.0.1
endif
source diff:
diff -Nru /tmp/YLVjcRiuol/fakeroot-1.2.10/scripts/fakeroot.in
/tmp/tnScTxVeeC/fakeroot-1.2.10/scripts/fakeroot.in
--- /tmp/YLVjcRiuol/fakeroot-1.2.10/scripts/fakeroot.in 2004-09-02
19:44:09.000000000 +0200
+++ /tmp/tnScTxVeeC/fakeroot-1.2.10/scripts/fakeroot.in 2005-05-08
20:12:36.000000000 +0200
@@ -19,7 +19,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@.so.0
[EMAIL PROTECTED]@:${PREFIX}/lib64/libfakeroot
[EMAIL PROTECTED]@:${PREFIX}/lib64/libfakeroot:${PREFIX}/lib32/libfakeroot
FAKED=${BINDIR}/@faked_transformed@
FAKED_MODE="unknown-is-root"
