tags 459109 + patch
thank you
Hi,
Here is an NMU to fix this issue as well as adds the patch for building
on GNU/kFreeBSD.
Thank you,
Barry deFreese
diff -u ogdi-dfsg-3.2.0~beta1/config.guess ogdi-dfsg-3.2.0~beta1/config.guess
--- ogdi-dfsg-3.2.0~beta1/config.guess
+++ ogdi-dfsg-3.2.0~beta1/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-03-06'
+timestamp='2008-01-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -330,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -532,7 +532,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -793,12 +793,15 @@
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -833,7 +836,14 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -954,8 +964,8 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -1474,9 +1484,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff -u ogdi-dfsg-3.2.0~beta1/config.sub ogdi-dfsg-3.2.0~beta1/config.sub
--- ogdi-dfsg-3.2.0~beta1/config.sub
+++ ogdi-dfsg-3.2.0~beta1/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-01-18'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -475,8 +487,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -668,6 +680,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -683,6 +703,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -809,6 +833,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -1017,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
diff -u ogdi-dfsg-3.2.0~beta1/debian/changelog ogdi-dfsg-3.2.0~beta1/debian/changelog
--- ogdi-dfsg-3.2.0~beta1/debian/changelog
+++ ogdi-dfsg-3.2.0~beta1/debian/changelog
@@ -1,3 +1,12 @@
+ogdi-dfsg (3.2.0~beta1-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * bashisms.dpatch - Remove bashisms. (Closes: #459109).
+ * kfreebsd.dpatch - Build on kfreebsd. (Closes: #448735).
+ + Thanks to Petr Salinger for the patch.
+
+ -- Barry deFreese <[EMAIL PROTECTED]> Fri, 07 Mar 2008 14:46:16 -0500
+
ogdi-dfsg (3.2.0~beta1-3) unstable; urgency=low
* Changed shared.dpatch to add -fPIC flag whenever required. This is due to
diff -u ogdi-dfsg-3.2.0~beta1/debian/patches/00list ogdi-dfsg-3.2.0~beta1/debian/patches/00list
--- ogdi-dfsg-3.2.0~beta1/debian/patches/00list
+++ ogdi-dfsg-3.2.0~beta1/debian/patches/00list
@@ -3,0 +4,2 @@
+bashisms
+kfreebsd
only in patch2:
unchanged:
--- ogdi-dfsg-3.2.0~beta1.orig/debian/patches/bashisms.dpatch
+++ ogdi-dfsg-3.2.0~beta1/debian/patches/bashisms.dpatch
@@ -0,0 +1,89 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bashisms.dpatch by <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove bashisms in build system.
+
[EMAIL PROTECTED]@
+diff -urNad ogdi-dfsg-3.2.0~beta1~/config/common.mak ogdi-dfsg-3.2.0~beta1/config/common.mak
+--- ogdi-dfsg-3.2.0~beta1~/config/common.mak 2007-03-26 09:49:06.000000000 -0400
++++ ogdi-dfsg-3.2.0~beta1/config/common.mak 2008-03-07 17:40:49.000000000 -0500
+@@ -229,12 +229,11 @@
+ ifeq ($(TARGETGEN),$(SHRDGEN))
+ default-install:
+ cp $(TARGETGEN) $(INST_LIB)
+- pushd $(INST_LIB); \
++ (cd $(INST_LIB); \
+ ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \
+ $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT).$(OGDI_MAJOR); \
+ ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \
+- $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT); \
+- popd
++ $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT))
+ endif
+
+ ifeq ($(TARGETGEN),$(ARCHGEN))
+@@ -253,9 +252,8 @@
+ install-so-link:
+ mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) $(INST_LIB)
+ mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) $(INST_LIB)
+- pushd $(INST_LIB); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \
+- $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT) ; \
+- popd
++ (cd $(INST_LIB); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \
++ $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT))
+
+ install: default-install $(EXTRA_INSTALL_TARGETS)
+
+@@ -271,7 +269,3 @@
+ #
+ # End of the common configuration
+ #
+-
+-
+-
+-
+diff -urNad ogdi-dfsg-3.2.0~beta1~/config/common.mak.in ogdi-dfsg-3.2.0~beta1/config/common.mak.in
+--- ogdi-dfsg-3.2.0~beta1~/config/common.mak.in 2007-02-24 12:37:34.000000000 -0500
++++ ogdi-dfsg-3.2.0~beta1/config/common.mak.in 2008-03-07 17:44:59.000000000 -0500
+@@ -229,12 +229,11 @@
+ ifeq ($(TARGETGEN),$(SHRDGEN))
+ default-install:
+ cp $(TARGETGEN) $(INST_LIB)
+- pushd $(INST_LIB); \
++ (cd $(INST_LIB); \
+ ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \
+ $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT).$(OGDI_MAJOR); \
+ ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \
+- $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT); \
+- popd
++ $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT))
+ endif
+
+ ifeq ($(TARGETGEN),$(ARCHGEN))
+@@ -253,9 +252,8 @@
+ install-so-link:
+ mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) $(INST_LIB)
+ mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) $(INST_LIB)
+- pushd $(INST_LIB); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \
+- $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT) ; \
+- popd
++ (cd $(INST_LIB); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \
++ $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT))
+
+ install: default-install $(EXTRA_INSTALL_TARGETS)
+
+diff -urNad ogdi-dfsg-3.2.0~beta1~/config/unix.mak ogdi-dfsg-3.2.0~beta1/config/unix.mak
+--- ogdi-dfsg-3.2.0~beta1~/config/unix.mak 2008-03-07 17:40:49.000000000 -0500
++++ ogdi-dfsg-3.2.0~beta1/config/unix.mak 2008-03-07 17:46:06.000000000 -0500
+@@ -94,8 +94,8 @@
+ $(SHRDGEN): $(OBJECTS)
+ @echo Making shared library: $@
+ $(SHLIB_LD) $(SHLIB_LDFLAGS) $(COMMON_LDFLAGS) $(COMMON_CFLAGS) -Wl,-soname,$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) -o $(TOPDIR)/bin/$(TARGET)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) $^ $(LINK_LIBS)
+- pushd $(TOPDIR)/bin/$(TARGET); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR); \
+- ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT); popd
++ (cd $(TOPDIR)/bin/$(TARGET); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR); \
++ ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT))
+ @echo $@ made successfully ...
+
+ $(DYNAGEN): $(OBJECTS)
only in patch2:
unchanged:
--- ogdi-dfsg-3.2.0~beta1.orig/debian/patches/kfreebsd.dpatch
+++ ogdi-dfsg-3.2.0~beta1/debian/patches/kfreebsd.dpatch
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kfreebsd.dpatch by <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build on GNU/kFreeBSD.
+
[EMAIL PROTECTED]@
+diff -urNad ogdi-dfsg-3.2.0~beta1~/config/common.mak ogdi-dfsg-3.2.0~beta1/config/common.mak
+--- ogdi-dfsg-3.2.0~beta1~/config/common.mak 2008-03-07 18:17:06.000000000 -0500
++++ ogdi-dfsg-3.2.0~beta1/config/common.mak 2008-03-07 18:20:36.000000000 -0500
+@@ -52,6 +52,9 @@
+
+ ifndef TARGET
+ TARGET = $(shell uname)
++ifeq ($(TARGET), GNU/kFreeBSD)
++TARGET = Linux
++endif
+ endif
+
+ #
+diff -urNad ogdi-dfsg-3.2.0~beta1~/config/common.mak.in ogdi-dfsg-3.2.0~beta1/config/common.mak.in
+--- ogdi-dfsg-3.2.0~beta1~/config/common.mak.in 2008-03-07 18:17:06.000000000 -0500
++++ ogdi-dfsg-3.2.0~beta1/config/common.mak.in 2008-03-07 18:20:00.000000000 -0500
+@@ -52,6 +52,9 @@
+
+ ifndef TARGET
+ TARGET = $(shell uname)
++ifeq ($(TARGET), GNU/kFreeBSD)
++TARGET = Linux
++endif
+ endif
+
+ #
+diff -urNad ogdi-dfsg-3.2.0~beta1~/configure ogdi-dfsg-3.2.0~beta1/configure
+--- ogdi-dfsg-3.2.0~beta1~/configure 2007-02-24 12:37:33.000000000 -0500
++++ ogdi-dfsg-3.2.0~beta1/configure 2008-03-07 18:18:54.000000000 -0500
+@@ -5278,5 +5278,8 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+ fi
+
+-mv config/generic.mak config/`uname`.mak
+-
++target=`uname`
++if test "$target" = "GNU/kFreeBSD" ; then
++ target=Linux
++fi
++mv config/generic.mak config/$target.mak
+diff -urNad ogdi-dfsg-3.2.0~beta1~/configure.in ogdi-dfsg-3.2.0~beta1/configure.in
+--- ogdi-dfsg-3.2.0~beta1~/configure.in 2007-02-24 12:37:33.000000000 -0500
++++ ogdi-dfsg-3.2.0~beta1/configure.in 2008-03-07 18:18:11.000000000 -0500
+@@ -349,5 +349,9 @@
+ [chmod +x ogdi-config])
+
+ AC_OUTPUT(config/generic.mak)
+-mv config/generic.mak config/`uname`.mak
+
++target=`uname`
++if test "$target" = "GNU/kFreeBSD" ; then
++ target=Linux
++fi
++mv config/generic.mak config/$target.mak
