Bug#305122: ia32-libs-dev: Fix for the linker script and more

2005-05-04 Thread Bdale Garbee
Goswin Brederlow [EMAIL PROTECTED] writes:

 attached the patch for to actually fix the linker script and to create
 the /usr/lib32 link needed by gcc-3.4.

Thank you!

Bdale


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#305122: ia32-libs-dev: Fix for the linker script and more

2005-05-03 Thread Goswin Brederlow
Package: ia32-libs-dev
Version: 1.2
Followup-For: Bug #305122

Hi,

attached the patch for to actually fix the linker script and to create
the /usr/lib32 link needed by gcc-3.4.

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 ia32-libs-dev depends on:
ii  ia32-libs 1.2ia32 shared libraries for use on a

-- no debconf information
diff -Nru /tmp/cjO75wUReS/ia32-libs-1.3/debian/changelog 
/tmp/nirAE8BSxi/ia32-libs-1.3/debian/changelog
--- /tmp/cjO75wUReS/ia32-libs-1.3/debian/changelog  2005-04-25 
03:33:32.0 +0200
+++ /tmp/nirAE8BSxi/ia32-libs-1.3/debian/changelog  2005-05-03 
18:36:30.0 +0200
@@ -1,3 +1,9 @@
+ia32-libs (1.3-0.0.0.1.pure64) unstable; urgency=low
+
+  * NMU - hotfix for /emul/ia32-linux/usr/lib/libc.so
+
+ -- Goswin von Brederlow [EMAIL PROTECTED]  Tue,  3 May 2005 18:36:06 +0200
+
 ia32-libs (1.3) unstable; urgency=low
 
   * Adjust linker scripts too, closes: #305122
diff -Nru /tmp/cjO75wUReS/ia32-libs-1.3/debian/rules 
/tmp/nirAE8BSxi/ia32-libs-1.3/debian/rules
--- /tmp/cjO75wUReS/ia32-libs-1.3/debian/rules  2005-04-25 03:26:00.0 
+0200
+++ /tmp/nirAE8BSxi/ia32-libs-1.3/debian/rules  2005-05-03 20:04:50.0 
+0200
@@ -56,6 +56,7 @@
 ifeq (Debian,$(OSVER))
mkdir -p  debian/ia32-libs/$(ROOT)/bin
mv debian/ia32-libs/bin/uname debian/ia32-libs/$(ROOT)/bin
+   ln -s /$(ROOT)/usr/lib$(SUFFIX) debian/ia32-libs/usr/lib32
 endif
 
 
@@ -116,18 +117,13 @@
  ln -s $$(echo $$dest | sed -e 's,^/,$(ROOT)/,' -e 
's,/lib/,/lib$(SUFFIX)/,') $$link;  \
done
 
-   # Ew, change linker scripts
-   for file in $$(find debian/ia32-libs/$(ROOT) -type f -name \*.so); do \
-   sed -i -e s: /: /$(ROOT)/:g $$file ; \
-   done
-
cat debian/ia32-libs-dev.preinst.in  debian/ia32-libs-dev.preinst
cat debian/ia32-libs-dev.postrm.in  debian/ia32-libs-dev.postrm
 
# Fix up GROUP commands in linker scripts
for lib in libc.so libpthread.so; do\
  cat debian/ia32-libs/$(ROOT)/usr/lib$(SUFFIX)/$$lib   
\
-   | sed -e 's,^/,$(ROOT),' -e 's,/lib/,/lib$(SUFFIX)/,g'  $$lib; 
\
+   | sed -e '/^GROUP/ { s, /, /$(ROOT)/,g ; s,/lib/,/lib$(SUFFIX)/,g 
}'  $$lib;   \
  mv -f $$lib debian/ia32-libs/$(ROOT)/usr/lib$(SUFFIX)/$$lib;  
\
done