Gettext 0.16 patch
This patch allows gettext-0.16 to be built, and it disables Java support
on Hurd since gcj is broken anyway. This should solve quite a few
dependency issues in the buildd (and help me get po-debconf for my local
buildd running.
--- gettext-runtime/configure.old 2007-07-14 17:20:43.570000000 -0400
+++ gettext-runtime/configure.ac 2007-07-14 15:06:07.410000000 -0400
@@ -78,6 +78,9 @@
AC_TYPE_SIZE_T
AC_CHECK_FUNCS([setlocale])
+dnl Check for Hurd's pthreads libray
+AC_CHECK_LIB(pthread, pthread_create)
+
dnl Put some default definitions into config.h.
AH_BOTTOM([
/* On Windows, variables that may be in a DLL must be marked specially. */
--- gettext-tools/configure.ac.save 2007-07-14 15:24:22.880000000 -0400
+++ gettext-tools/configure.ac 2007-07-14 15:28:03.190000000 -0400
@@ -147,6 +147,9 @@
AC_CHECK_MEMBERS([struct __locale_struct.__names], , , [#include <xlocale.h>])
fi
+dnl Check for Hurd pthread
+AC_CHECK_LIB(pthread, pthread_create)
+
dnl Checks for library functions.
AC_CHECK_FUNCS([select])
AC_FUNC_VFORK
--- debian/control.save 2007-07-14 14:37:11.410000000 -0400
+++ debian/control 2007-07-14 14:37:49.970000000 -0400
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Santiago Vila <sanvila@debian.org>
Standards-Version: 3.7.2
-Build-Depends: libexpat1-dev, fastjar, jikes-classpath, mono-mcs [amd64 arm i386 ia64 powerpc]
+Build-Depends: libexpat1-dev, fastjar [!hurd-i386], jikes-classpath [!hurd-i386], mono-mcs [amd64 arm i386 ia64 powerpc]
Package: gettext-base
Section: utils
--- debian/rules.save 2007-07-14 17:27:06.010000000 -0400
+++ debian/rules 2007-07-14 17:38:58.830000000 -0400
@@ -20,6 +20,7 @@
endif
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
# PNET_ARCHS = %alpha%amd64%hppa%i386%ia64%mips%mipsel%powerpc%s390%sparc%
# ifneq (,$(findstring %$(DEB_HOST_ARCH)%,$(PNET_ARCHS)))
@@ -31,6 +32,8 @@
CSHARP = --enable-csharp=mono
endif
+NO_JAVA_OS = %hurd%
+
build:
cd debian && $(CC) glibc-test.c
debian/a.out
@@ -82,8 +85,10 @@
$(STRIP) debian/$@/usr/lib/libasprintf.so.*
find debian/$@/usr/share/locale | grep gettext-tools | xargs rm
install -d debian/$@/usr/share/java
+ifneq (,$(findstring %$(DEB_HOST_ARCH_OS)%,$(NO_JAVA_ARCHS)))
cp -p debian/tmp/usr/share/gettext/libintl.jar \
debian/$@/usr/share/java
+endif
cp -p gettext-tools/ABOUT-NLS debian/$@/usr/share/doc/$@
cp -p debian/copyright debian/$@/usr/share/doc/$@
install -m 644 debian/$@.shlibs debian/$@/DEBIAN/shlibs
@@ -123,8 +128,10 @@
cp -a debian/tmp/usr/share/info debian/$@/usr/share
cp -a debian/tmp/usr/share/aclocal debian/$@/usr/share
cp -a debian/tmp/usr/share/gettext debian/$@/usr/share
+ifneq (,$(findstring %$(DEB_HOST_ARCH_OS)%,$(NO_JAVA_ARCHS)))
rm -f debian/$@/usr/share/gettext/libintl.jar
mv debian/$@/usr/share/gettext/gettext.jar debian/$@/usr/share/java
+endif
rm -f debian/$@/usr/lib/GNU.Gettext.dll
cp -a debian/tmp/usr/share/man/man1 debian/$@/usr/share/man
cp -a debian/tmp/usr/share/locale debian/$@/usr/share
Regards,
Michael
PS. I'm compiling GCC 4.2 now since I noticed it is available, and I'll
post a patch to fix profiling once its done and I finish building the
package.
Reply to: