[pkg-GNUstep-maintainers] Bug#267889: FTBFS on kfreebsd-gnu

[Robert Millan]

This is a multi-part MIME message sent by reportbug.

--===============1997404868==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: gnustep-base
Severity: wishlist
Tags: patch

This package fails to build on kfreebsd-gnu.  The attached patch fixes the
problems.  Please remember to regenerate debian/control and configure.

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: kfreebsd-i386 (i386)
Kernel: GNU/kFreeBSD 5.2.1-6
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (ignored: LC_ALL set to C)

--===============1997404868==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="gnustep-base_1.9.2-6.diff"

diff -ur gnustep-base-1.9.2.old/configure.ac gnustep-base-1.9.2/configure.ac
--- gnustep-base-1.9.2.old/configure.ac	2004-05-28 21:43:55.000000000 +0200
+++ gnustep-base-1.9.2/configure.ac	2004-08-25 00:05:58.000000000 +0200
@@ -825,7 +825,6 @@
 # If /proc doesn't work, try kvm (on FreeBSD, for instance)
 #--------------------------------------------------------------------
 have_kvm_env=0
-save_LIBS="$LIBS"
 AC_CHECK_LIB(kvm, kvm_getenvv)
 if test "$ac_cv_lib_kvm_kvm_getenvv" = yes; then
   AC_MSG_CHECKING(if we can access kernel memory)
@@ -840,8 +839,6 @@
   else
     AC_MSG_RESULT(no)
   fi
-  # Reset LIBS since we don't need kvm
-  LIBS="$save_LIBS"
 fi
 
 #--------------------------------------------------------------------
diff -ur gnustep-base-1.9.2.old/debian/control.m4 gnustep-base-1.9.2/debian/control.m4
--- gnustep-base-1.9.2.old/debian/control.m4	2004-08-24 23:28:00.000000000 +0200
+++ gnustep-base-1.9.2/debian/control.m4	2004-08-25 00:06:41.000000000 +0200
@@ -8,7 +8,7 @@
 Maintainer: Debian GNUstep maintainers <pkg-gnustep-maintainers@lists.alioth.debian.org>
 Uploaders: Matthias Klose <doko@debian.org>, Eric Heintzmann <eric@gnustep.fr.st>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4), gobjc (>= V_OBJC), gnustep-make (>= V_MAKE), libffcall1-dev (>= 1.10) [FFCALL_ARCHS], libffi2-dev [FFI_ARCHS], libgmp3-dev (>= 4.1.2), libxml2-dev, libxslt1-dev, libssl-dev, zlib1g-dev, m4
+Build-Depends: debhelper (>= 4), gobjc (>= V_OBJC), gnustep-make (>= V_MAKE), libffcall1-dev (>= 1.10) [FFCALL_ARCHS], libffi2-dev [FFI_ARCHS], libgmp3-dev (>= 4.1.2), libxml2-dev, libxslt1-dev, libssl-dev, zlib1g-dev, m4, libkvm-dev [KVM_ARCHS], type-handling (>= 0.2.1)
 Build-Depends-Indep: texi2html, texinfo, tetex-bin
 
 Package: gnustep-base-common
diff -ur gnustep-base-1.9.2.old/debian/rules gnustep-base-1.9.2/debian/rules
--- gnustep-base-1.9.2.old/debian/rules	2004-08-24 23:28:00.000000000 +0200
+++ gnustep-base-1.9.2/debian/rules	2004-08-25 00:07:37.000000000 +0200
@@ -28,7 +28,7 @@
 # from having to guess our platform (since we know it already)
 DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_CPU	?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 
 # make some files executable
 dummy := $(shell chmod +x configure)
@@ -58,15 +58,15 @@
 # -----------------------------------------------------------------------------
 # FFI lib settings
 
-FFCALL_ARCHS	= alpha amd64 arm hppa i386 ia64 m68k mips powerpc s390 sparc
-FFI_ARCHS	= mipsel
+FFCALL_CPUS	= alpha x86_64 arm hppa i386 ia64 m68k mips powerpc s390 sparc
+FFI_CPUS	= mipsel
 
-ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),$(FFI_ARCHS)))
+ifeq ($(DEB_HOST_GNU_CPU), $(findstring $(DEB_HOST_GNU_CPU),$(FFI_CPUS)))
   FFI_LIB = ffi
   FFI_CONFIG = --enable-libffi
   FFI_DEVPKG = libffi2-dev
 else
-  ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),$(FFCALL_ARCHS)))
+  ifeq ($(DEB_HOST_GNU_CPU), $(findstring $(DEB_HOST_GNU_CPU),$(FFCALL_CPUS)))
     FFI_LIB = ffcall
     FFI_CONFIG = --enable-ffcall
     FFI_DEVPKG = libffcall1-dev
@@ -129,8 +129,9 @@
 		-DV_MAKE='$(v_make)' \
 		-DSOV_BASE='$(sov_base)' \
 		-DWITH_DEBUG \
-		-DFFCALL_ARCHS='$(FFCALL_ARCHS)' \
-		-DFFI_ARCHS='$(FFI_ARCHS)' \
+		-DFFCALL_ARCHS="$(shell type-handling `echo $(FFCALL_CPUS) | tr ' ' ,` any)" \
+		-DFFI_ARCHS="$(shell type-handling `echo $(FFI_CPUS) | tr ' ' ,` any)" \
+		-DKVM_ARCHS="$(shell type-handling any kfreebsd-gnu,knetbsd-gnu)" \
 		-DFFI_DEVPKG='$(FFI_DEVPKG)' \
 		debian/control.m4 | uniq > debian/control.tmp
 

--===============1997404868==--