Bug#268929: new patch
Hi,
the test condition for amd64 is reversed in the last patch which
breaks amd64 and possibly sparc and s390.
Here is the same patch with reversed test.
MfG
Goswin
======================================================================
diff -Nurd gcc-3.3-3.3.4/debian/rules2 gcc-3.3-3.3.4-mrvn/debian/rules2
--- gcc-3.3-3.3.4/debian/rules2 2004-08-29 22:11:56.000000000 +0000
+++ gcc-3.3-3.3.4-mrvn/debian/rules2 2004-08-29 22:45:58.906877945 +0000
@@ -340,8 +340,12 @@
#endif
: # fix '*.la' and '*.lai' files
+ifeq (,$(findstring $(DEB_HOST_ARCH),amd64))
for i in $$(find $(buildlibdir) -name '*.la' -o -name '*.lai'); do \
- sed 's,/usr/lib/\.,/usr/lib,g' $$i > $$i.new; \
+ sed "s,/usr/lib/\.',/usr/lib',g; \
+ s,/usr/lib64/\.',/usr/lib64',g; \
+ s,/usr/lib/\.\./lib',/usr/lib',g; \
+ s,/usr/lib/\.\./lib64',/usr/lib64',g" $$i > $$i.new; \
if diff -u $$i $$i.new; then \
rm -f $$i.new; \
else \
@@ -349,6 +353,21 @@
mv -f $$i.new $$i; \
fi; \
done
+else
+ : # pure64 has only /usr/lib
+ for i in $$(find $(buildlibdir) -name '*.la' -o -name '*.lai'); do \
+ sed "s,/usr/lib/\.',/usr/lib',g; \
+ s,/usr/lib64/\.',/usr/lib',g; \
+ s,/usr/lib/\.\./lib',/usr/lib',g; \
+ s,/usr/lib/\.\./lib64',/usr/lib',g" $$i > $$i.new; \
+ if diff -u $$i $$i.new; then \
+ rm -f $$i.new; \
+ else \
+ touch -r $$i $$i.new; \
+ mv -f $$i.new $$i; \
+ fi; \
+ done
+endif
ifeq ($(with_java),yes)
: # work around libtool bug including /usr/lib/. in rpath
Reply to: