Package: ogdi-dfsg
Version: 3.2.0~beta2-4
Severity: normal
Hi,
ogdi-dfsg currently fails to build on Debian GNU/Hurd as GNU is not
recognized. Here is a patch to resolve the issue. Adding the
include/GNU/... file might not be necessary but seemed more clean.
Thank you,
Barry deFreese
--- ogdi-dfsg-3.2.0~beta2.orig/config/GNU.mak
+++ ogdi-dfsg-3.2.0~beta2/config/GNU.mak
@@ -0,0 +1,109 @@
+# Copyright (C) 2001 Her Majesty the Queen in Right of Canada.
+# Permission to use, copy, modify and distribute this software and
+# its documentation for any purpose and without fee is hereby granted,
+# provided that the above copyright notice appear in all copies, that
+# both the copyright notice and this permission notice appear in
+# supporting documentation, and that the name of Her Majesty the Queen
+# in Right of Canada not be used in advertising or publicity pertaining
+# to distribution of the software without specific, written prior
+# permission. Her Majesty the Queen in Right of Canada makes no
+# representations about the suitability of this software for any purpose.
+# It is provided "as is" without express or implied warranty.
+
+# Generic unix configuration file, processed by configure to make
+# platform specific.
+
+#
+# Read in the configuration common to all Unix
+#
+include $(TOPDIR)/config/unix.mak
+
+#
+# platform specific Symbols
+#
+PLATFORM = $(TARGET)
+_SOLARIS = 1
+USE_TERMIO = -DUSE_TERMIO
+
+#
+# platform specific tools
+#
+AR = ar cr
+
+
+#
+# Compilation and linking flags
+#
+SHLIB_CFLAGS = -fPIC
+COMMON_CFLAGS = $(OPTIMIZATION) -Wall -O2 -Wall -DUNIX=1
+
+SHLIB_LDFLAGS = -shared
+COMMON_LDFLAGS = $(OPTIMIZATION)
+
+RPC_INCLUDES = -DHAVE_STD_RPC_INCLUDES
+
+UCB_STATICLIB =
+
+TCL_INCLUDE = -I/usr/include/tcl8.4
+TCL_LINKLIB =
+
+#
+# Install Locations
+#
+prefix = /usr
+exec_prefix = ${prefix}
+INST_INCLUDE = ${prefix}/include
+INST_LIB = ${exec_prefix}/lib
+INST_BIN = ${exec_prefix}/bin
+
+#
+# platform specific file locations
+#
+#RPC_LINKLIB = -lrpcsvc -lnsl -lsocket
+#RPC_LINKLIB = -ldl -ldbmalloc
+RPC_LINKLIB = -ldl
+
+#
+# Endian definition, could be little or big
+#
+BIG_ENDIAN = 0
+
+#
+# Handle internal/external PROJ.4 library usage.
+#
+
+PROJ_SETTING=external
+
+ifeq ($(PROJ_SETTING),external)
+PROJ_INCLUDE := -I/usr/include
+PROJ_STATICLIB := -lproj
+endif
+
+#
+# Handle internal/external ZLIB library usage.
+#
+
+ZLIB_SETTING=external
+
+ifeq ($(ZLIB_SETTING),external)
+ZLIB_INCLUDE := -I/usr/include
+ZLIB_LINKLIB := -lz
+endif
+
+#
+# Handle internal/external/disabled "Expat" library handling.
+#
+
+EXPAT_SETTING=external
+
+ifeq ($(EXPAT_SETTING),external)
+EXPAT_INCLUDE := -I/usr/include
+EXPAT_LINKLIB := -lexpat
+endif
+
+ifeq ($(EXPAT_SETTING),disabled)
+EXPAT_INCLUDE := -DEXPAT_DISABLED
+EXPAT_LINKLIB :=
+endif
+
+
only in patch2:
unchanged:
--- ogdi-dfsg-3.2.0~beta2.orig/include/GNU/ogdi_macro.h
+++ ogdi-dfsg-3.2.0~beta2/include/GNU/ogdi_macro.h
@@ -0,0 +1,48 @@
+#include <signal.h>
+#include <wait.h>
+#include <rpc/xdr.h>
+#include <stdio.h>
+
+#define ogdi_IXDR_PUT_LONG(buf, v) { \
+ long ZF = ((long)IXDR_PUT_INT32(buf, (long)(v))); \
+ ZF = ZF; \
+ }
+
+#define ogdi_IXDR_PUT_U_LONG(buf, v) ogdi_IXDR_PUT_LONG(buf, (long)(v))
+
+
+
+
+// Hook fread/fwrite/fgets/system. Check returns for errors and print tham
verbose if any.
+
+#define ogdi_read(p,s,fp) { \
+ unsigned int ZF = read(p,s,fp); \
+ if (ZF == -1 ) \
+ printf("Error: read error\n"); \
+ }
+
+#define ogdi_fread(p,s,n,fp) { \
+ unsigned int ZF = fread(p,s,n,fp); \
+ if (ZF != (unsigned) (n)) \
+ printf("Error: fread found %d bytes, not %d at %d\n", ZF,
(int)(n), (int) ftell(fp)); \
+ }
+
+#define ogdi_fwrite(p,s,n,fp) { \
+ unsigned int ZF = fwrite(p,s,n,fp); \
+ if (ZF != (unsigned) (n)) \
+ printf("Error: fwrite wrote %d bytes, not %d at %d\n", ZF,
(int)(n), (int) ftell(fp)); \
+ }
+
+#define ogdi_fgets(p,n,fp) { \
+ void *ZF = fgets(p,n,fp); \
+ if (ZF == NULL) \
+ printf("Error: fgets seek error at %d byte\n", (int)(n)); \
+ }
+
+#define ogdi_system(fp) { \
+ int ZF = system(fp); \
+ if (WIFSIGNALED(ZF) && \
+ (WTERMSIG(ZF) == SIGINT || WTERMSIG(ZF) == SIGQUIT)) \
+ printf("Error: shell not found or command error.\n"); \
+ }
+
