1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
Description: Fix FTBFS on GNU/kFreeBSD
* Fix termio.h header inclusion for GNU/kFreeBSD
* Extend FreeBSD make conditional to exclude GNU/kFreeBSD
Author: Petr Salinger <Petr.Salinger@seznam.cz>
Author: Yavor Doganov <yavor@gnu.org>
Bug-Debian: http://bugs.debian.org/681135
Forwarded: https://savannah.nongnu.org/bugs/index.php?52615
Last-Update: 2017-12-07
---
--- terminal.app.orig/TerminalView.m
+++ terminal.app/TerminalView.m
@@ -44,7 +44,7 @@
# include <termios.h>
# include <util.h>
# include <sys/ioctl.h>
-#elif defined (__GNU__)
+#elif defined (__GNU__) || defined (__GLIBC__)
#else
# include <termio.h>
#endif
--- terminal.app.orig/GNUmakefile
+++ terminal.app/GNUmakefile
@@ -65,8 +65,11 @@
else
ifeq ($(findstring freebsd, $(GNUSTEP_TARGET_OS)), freebsd)
+# Exclude GNU/kFreeBSD (kfreebsd-gnu) where iconv is part of glibc.
+ifeq ($(findstring gnu, $(GNUSTEP_TARGET_OS)),)
Terminal_TOOL_LIBS += -liconv
endif
+endif
Terminal_TOOL_LIBS += -lutil
endif
|
