Hi,
please could you support mpich and dependents on kFreeBSD.
Attached please find a modified and extended patch,
updating of config.{guess,sub} is done at build time,
not via dpatch. This variant is easily reviewable.
Thanks in advance.
Petr
diff -u mpich-1.2.7/debian/control mpich-1.2.7/debian/control
--- mpich-1.2.7/debian/control
+++ mpich-1.2.7/debian/control
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Adam C. Powell, IV <[EMAIL PROTECTED]>
Standards-Version: 3.6.2.1
-Build-Depends: g77, rsh-client, libx11-dev, libxt-dev, file, debhelper (>>
4.0.0), dpatch, tk8.4
+Build-Depends: g77, rsh-client, libx11-dev, libxt-dev, file, debhelper (>>
4.0.0), dpatch, tk8.4, autotools-dev
Build-Depends-Indep: bzip2
Package: mpich-bin
diff -u mpich-1.2.7/debian/rules mpich-1.2.7/debian/rules
--- mpich-1.2.7/debian/rules
+++ mpich-1.2.7/debian/rules
@@ -17,6 +17,9 @@
CONFIGURE_OPTIONS= -rsh=/usr/bin/rsh
+CONFIG_SG_DIRS= mpe mpe/slog2sdk mpe/slog2sdk/trace_rlog
mpe/slog2sdk/trace_sample \
+ examples/perftest/config/confdb src/fortran/config MPI-2-C++
romio/confdb
+
# checks the environmental variable DEB_BUILD_OPTIONS
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CONFIGURE_OPTIONS+= --enable-devdebug --enable-debug
@@ -46,6 +49,9 @@
build: build-stamp
build-stamp: patch-stamp
dh_testdir
+ for CFGAUXDIR in $(CONFIG_SG_DIRS) ; do \
+ cp -f /usr/share/misc/config.{sub,guess} $$CFGAUXDIR ; \
+ done
# make mpich normal
(test -d image_mpich || mkdir image_mpich; cd image_mpich &&
../configure \
$(CONFIGURE_OPTIONS_P4) && \
@@ -79,6 +85,9 @@
clean: unpatch
dh_testdir
dh_testroot
+ for CFGAUXDIR in $(CONFIG_SG_DIRS) ; do \
+ rm -f $$CFGAUXDIR/config.{sub,guess} ; \
+ done
rm -f build-stamp install-stamp
# clean up the build directory
(set -e; for INST in mpich mpich-mpd mpich-shmem ; do \
diff -u mpich-1.2.7/debian/patches/00list mpich-1.2.7/debian/patches/00list
--- mpich-1.2.7/debian/patches/00list
+++ mpich-1.2.7/debian/patches/00list
@@ -14,0 +15 @@
+19_kfreebsd
only in patch2:
unchanged:
--- mpich-1.2.7.orig/debian/patches/19_kfreebsd.dpatch
+++ mpich-1.2.7/debian/patches/19_kfreebsd.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh -e
+## 19_kfreebsd.dpatch by Aurelien Janro <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add support for GNU/kFreeBSD
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+ -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+--- mpich-1.2.7.orig/bin/tarch
++++ mpich-1.2.7/bin/tarch
+@@ -138,6 +138,7 @@
+ next) FARCH=NeXT ; break ;;
+ KSR1|KSR2) FARCH=ksr ; break ;;
+ FreeBSD) FARCH=freebsd ; break ;;
++ GNU/kFreeBSD) FARCH=freebsd ; break ;;
+ NetBSD) FARCH=netbsd ; break ;;
+ i386) GARCH=ipsc2 ;;
+ ULTRIX|RISC) GARCH=dec5000 ;;
+
+--- mpich-1.2.7.orig/mpid/ch_p4/p4/lib/p4_secure.c
++++ mpich-1.2.7/mpid/ch_p4/p4/lib/p4_secure.c
+@@ -367,6 +367,7 @@
+ #if defined(P4BSD) && !defined(NO_ECHO)
+
+ #ifdef FREEBSD
++#include <sys/ioctl.h>
+ #include <sys/ioctl_compat.h>
+ #else
+ #include <sys/ioctl.h>
+
