[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#674444: ckermit: FTBFS on hurd-i386



Source: ckermit
Version: 302-2
Severity: important
Tags: patch
User: debian-hurd@lists.debian.org
Usertags: hurd

Hello,

Unfortunately the patch 020_fix_ptys.patch caused a built problem for
GNU/Hurd again. Defining the value of _XOPEN_SOURCE to 500, of that
patch, enables the __USE_UNIX98 features, so that IXANY is defined
during the build.

Additionally, since /dev/ptmx is not defined for GNH/Hurd, it should
not be opened in ckupty.c. This is fixed by not defining HAVE_PTMX for
Hurd in the debian/rules file.
diff -ur ckermit-302/ckupty.c ckermit-302-2.patched/ckupty.c
--- ckermit-302/ckupty.c	2012-05-24 16:26:22.000000000 +0200
+++ ckermit-302-2.patched/ckupty.c	2012-05-24 18:10:16.000000000 +0200
@@ -54,7 +54,7 @@
    . HP-UX 8.00 and earlier (no vhangup or ptsname routines)
 */
 
-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE 500
 #include <stdlib.h>
 #include "ckcsym.h"
 #include "ckcdeb.h"			/* To pick up NETPTY definition */
diff -ur ckermit-302/debian/rules ckermit-302-2.patched/debian/rules
--- ckermit-302/debian/rules	2012-05-19 11:22:12.000000000 +0200
+++ ckermit-302-2.patched/debian/rules	2012-05-24 18:59:49.000000000 +0200
@@ -13,7 +13,7 @@
 CFLAGS +=-g \
 	-DIKSDCONF=\\\\\\\\\\\\\\\"/etc/kermit/iksd.conf\\\\\\\\\\\\\\\"  \
 	-DCK_SYSINI=\\\\\\\\\\\\\\\"/etc/kermit/kermrc\\\\\\\\\\\\\\\"  \
-	-DCK_INI_B -DX509_SUBJECT_ALT_NAME_TO_USER -DHAVE_PTMX
+	-DCK_INI_B -DX509_SUBJECT_ALT_NAME_TO_USER
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -25,6 +25,10 @@
 ifneq (,$(or $(findstring kfreebsd, $(DEB_HOST_ARCH_OS)), $(findstring hurd, $(DEB_HOST_ARCH_OS))))
 	CFLAGS += -DSELECT
 endif
+ifeq (,$(findstring hurd, $(DEB_HOST_ARCH_OS)))
+	CFLAGS += -DHAVE_PTMX
+endif
+
 
 LINKERFLAGS=`dpkg-buildflags --get LDFLAGS`
 LINKERFLAGS+=-Wl,-z,defs -Wl,--as-needed

Reply to: