Hi.
Openal currently fails to build on mips and mipsel again since you
again missed to include the NMU patches in subsequent uploads.
Please consider the following updated patch. If you don't raise any
objections I will upload a NMU tomorrow.
diff -Naur openal-0.2005080600.bak/debian/changelog
openal-0.2005080600/debian/changelog
--- openal-0.2005080600.bak/debian/changelog 2005-10-13 19:17:47.000000000
+0200
+++ openal-0.2005080600/debian/changelog 2005-10-13 19:28:24.000000000
+0200
@@ -1,3 +1,11 @@
+openal (0.2005080600-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Reapply the previous NMU patches for fixing mips(el) builds
+ (Closes: #199557, #283117)
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Thu, 13 Oct 2005 19:27:27 +0200
+
openal (0.2005080600-2) unstable; urgency=low
* added openal-config (Closes: #323054)
diff -Naur openal-0.2005080600.bak/linux/config.h.in
openal-0.2005080600/linux/config.h.in
--- openal-0.2005080600.bak/linux/config.h.in 2005-10-13 19:17:47.000000000
+0200
+++ openal-0.2005080600/linux/config.h.in 2005-10-13 19:18:40.000000000
+0200
@@ -10,9 +10,6 @@
#undef BOMB
/* undocumented */
-#undef BROKEN_LIBIO
-
-/* undocumented */
#undef BSD_TARGET
/* undocumented */
diff -Naur openal-0.2005080600.bak/linux/configure
openal-0.2005080600/linux/configure
--- openal-0.2005080600.bak/linux/configure 2005-10-13 19:17:47.000000000
+0200
+++ openal-0.2005080600/linux/configure 2005-10-13 19:22:31.000000000 +0200
@@ -3012,7 +3012,6 @@
*i486*) CFLAGS="$CFLAGS -march=i486" ;;
*i586*) CFLAGS="$CFLAGS -march=i586" ;;
*i686*) CFLAGS="$CFLAGS -march=i686" ;;
- mips*) CFLAGS="$CFLAGS -march=mips" ;;
esac
fi
@@ -3514,16 +3513,7 @@
case "$target" in
*linux*)
- case "$target" in
- *mips* )
-
-cat >>confdefs.h <<\_ACEOF
-#define BROKEN_LIBIO 1
-_ACEOF
- ;;
- *) ;;
- esac
- WFLAGS="$WFLAGS -ansi"
+ WFLAGS="$WFLAGS -ansi"
cat >>confdefs.h <<\_ACEOF
#define LINUX_TARGET 1
diff -Naur openal-0.2005080600.bak/linux/configure.ac
openal-0.2005080600/linux/configure.ac
--- openal-0.2005080600.bak/linux/configure.ac 2005-03-31 15:50:34.000000000
+0200
+++ openal-0.2005080600/linux/configure.ac 2005-10-13 19:22:20.000000000
+0200
@@ -74,7 +74,6 @@
*i486*) CFLAGS="$CFLAGS -march=i486" ;;
*i586*) CFLAGS="$CFLAGS -march=i586" ;;
*i686*) CFLAGS="$CFLAGS -march=i686" ;;
- mips*) CFLAGS="$CFLAGS -march=mips" ;;
esac
fi
@@ -129,11 +128,6 @@
case "$target" in
*linux*)
dnl subtest for mips/linux systems with broken libio headers
- case "$target" in
- *mips* )
- AC_DEFINE(BROKEN_LIBIO, 1, [undocumented]) ;;
- *) ;;
- esac
WFLAGS="$WFLAGS -ansi"
AC_DEFINE(LINUX_TARGET, 1, [undocumented])
OS_OBJS="\$(LIN_OBJS)" ;;
diff -Naur openal-0.2005080600.bak/linux/jlib/globals.c
openal-0.2005080600/linux/jlib/globals.c
--- openal-0.2005080600.bak/linux/jlib/globals.c 2003-06-20
21:23:05.000000000 +0200
+++ openal-0.2005080600/linux/jlib/globals.c 2005-10-13 19:19:33.000000000
+0200
@@ -14,11 +14,6 @@
#include <ctype.h>
-#ifdef BROKEN_LIBIO
-#include <libio.h>
-#define __underflow __broken_underflow
-#define __overflow __broken_overflow
-#endif /* BROKEN_LIBIO */
#include <stdio.h>
#include <stdlib.h>
diff -Naur openal-0.2005080600.bak/linux/jlib/hash.c
openal-0.2005080600/linux/jlib/hash.c
--- openal-0.2005080600.bak/linux/jlib/hash.c 2003-06-20 21:23:05.000000000
+0200
+++ openal-0.2005080600/linux/jlib/hash.c 2005-10-13 19:19:33.000000000
+0200
@@ -1,13 +1,6 @@
#define NOJLIB
#include "../src/al_siteconfig.h"
-#ifdef BROKEN_LIBIO
-#include <libio.h>
-#define __underflow __broken_underflow
-#define __overflow __broken_overflow
-#include <stdio.h>
-#endif /* BROKEN_LIBIO */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff -Naur openal-0.2005080600.bak/linux/src/al_siteconfig.h
openal-0.2005080600/linux/src/al_siteconfig.h
--- openal-0.2005080600.bak/linux/src/al_siteconfig.h 2002-09-16
16:39:54.000000000 +0200
+++ openal-0.2005080600/linux/src/al_siteconfig.h 2005-10-13
19:19:33.000000000 +0200
@@ -52,19 +52,4 @@
#include "../include/jlib.h"
#endif
-
-#ifdef BROKEN_LIBIO
-#include <libio.h>
-#define __underflow __broken_underflow
-#define __overflow __broken_overflow
-#include <stdio.h>
-
-#define __ASSEMBLER__
-#include <errnos.h>
-
-#define __USE_POSIX
-#include <signal.h>
-
-#endif /* BROKEN_LIBIO */
-
#endif /* AL_SITE_CONFIG_H_ */
Gruesse,
