tags 397695 + patch
thanks
Hi,
Attached is the diff for my mocka 9905-3.1 NMU.
diff -Nru /tmp/DqakiXJ0Yx/mocka-9905/debian/changelog
/tmp/aJ4Q3zAAL3/mocka-9905/debian/changelog
--- /tmp/DqakiXJ0Yx/mocka-9905/debian/changelog 2006-11-16 00:26:32.000000000
+0100
+++ /tmp/aJ4Q3zAAL3/mocka-9905/debian/changelog 2006-11-16 00:26:32.000000000
+0100
@@ -1,3 +1,15 @@
+mocka (9905-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix run error and FTBFS with glibc 2.3, which moved errno to thread-local
+ storage. (Closes: #397695)
+ * When calling the included mc, use LD_ASSUME_KERNEL=2.4.1 to work around
+ the issue at build time.
+ * Fix sys/M2RTS-elf.s so new binaries use the new form of errno; makes
+ the compiled binaries (including Mc itself) run properly.
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Thu, 16 Nov 2006 00:20:10 +0100
+
mocka (9905-3) unstable; urgency=low
* Rebuild for sarge release to fix the missing mandatory format field
diff -Nru /tmp/DqakiXJ0Yx/mocka-9905/debian/rules
/tmp/aJ4Q3zAAL3/mocka-9905/debian/rules
--- /tmp/DqakiXJ0Yx/mocka-9905/debian/rules 2006-11-16 00:26:32.000000000
+0100
+++ /tmp/aJ4Q3zAAL3/mocka-9905/debian/rules 2006-11-16 00:26:32.000000000
+0100
@@ -2,7 +2,7 @@
MOCKADRV := $(shell command -v mocka 2>/dev/null || true)
ifeq ($(strip $(MOCKADRV)),)
-MOCKA := MOCKADIR=$(shell pwd) $(shell pwd)/bin/mc
+MOCKA := MOCKADIR=$(shell pwd) LD_ASSUME_KERNEL=2.4.1 $(shell pwd)/bin/mc
else
MOCKA := $(MOCKADRV)
endif
diff -Nru /tmp/DqakiXJ0Yx/mocka-9905/sys/M2RTS-elf.s
/tmp/aJ4Q3zAAL3/mocka-9905/sys/M2RTS-elf.s
--- /tmp/DqakiXJ0Yx/mocka-9905/sys/M2RTS-elf.s 1999-09-06 13:41:29.000000000
+0200
+++ /tmp/aJ4Q3zAAL3/mocka-9905/sys/M2RTS-elf.s 2006-11-16 00:26:32.000000000
+0100
@@ -16,7 +16,7 @@
.globl _M2ROOT # Imports
.globl write
.globl abort
- .globl errno
+ .globl __errno_location
.globl main # Exports
.globl GetArgs
@@ -100,7 +100,8 @@
# IMPLEMENTATION MODULE ErrNumbers
# PROCEDURE ErrNo () : SHORTCARD;
ErrNo:
- movl errno,%eax
+ call __errno_location
+ movl (%eax),%eax
ret
# IMPLEMENTATION MODULE SYSTEM
