From ac3b65a557ae449dc52074be8d9926d45596a044 Mon Sep 17 00:00:00 2001 From: ryoon Date: Thu, 17 Jul 2014 12:49:15 +0000 Subject: Fix SCO OpenServer 5.0.7/3.2 build. It has no S_ISSOCK. --- shells/bash/Makefile | 4 +++- shells/bash/distinfo | 3 ++- shells/bash/patches/patch-lib_readline_colors.c | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 shells/bash/patches/patch-lib_readline_colors.c (limited to 'shells/bash') diff --git a/shells/bash/Makefile b/shells/bash/Makefile index ed624e7140b..2681b204d4e 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2014/03/12 10:08:46 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2014/07/17 12:49:15 ryoon Exp $ BASH_VERSION= 4.3 @@ -30,6 +30,8 @@ CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bi MAKE_JOBS_SAFE= no TEST_TARGET= test +CFLAGS+= -g + INFO_FILES= YES # PLIST PKG_SHELL= bin/bash INSTALLATION_DIRS= ${PKGMANDIR}/man1 diff --git a/shells/bash/distinfo b/shells/bash/distinfo index c8a415ee017..4674e78239f 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2014/03/12 10:08:46 wiz Exp $ +$NetBSD: distinfo,v 1.30 2014/07/17 12:49:15 ryoon Exp $ SHA1 (bash-4.3.tar.gz) = 45ac3c5727e7262334f4dfadecdf601b39434e84 RMD160 (bash-4.3.tar.gz) = cd21a9f51ea7780994d4e2c9c7d16d5eb000f845 @@ -7,3 +7,4 @@ SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48 SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e SHA1 (patch-builtins_ulimit.def) = d4cb59bedc6a6199f9a99a3530c99374e428baeb +SHA1 (patch-lib_readline_colors.c) = f2f47e7aa0b5c1e999368109de10f80e39fd4438 diff --git a/shells/bash/patches/patch-lib_readline_colors.c b/shells/bash/patches/patch-lib_readline_colors.c new file mode 100644 index 00000000000..31aaeaa6e1b --- /dev/null +++ b/shells/bash/patches/patch-lib_readline_colors.c @@ -0,0 +1,17 @@ +$NetBSD: patch-lib_readline_colors.c,v 1.1 2014/07/17 12:49:15 ryoon Exp $ + +* SCO OpenServer 5.0.7/3.2 has no S_ISSOCK. + +--- lib/readline/colors.c.orig 2013-03-20 15:19:08.000000000 +0000 ++++ lib/readline/colors.c +@@ -187,8 +187,10 @@ _rl_print_color_indicator (char *f) + ? C_ORPHAN : C_LINK); + else if (S_ISFIFO (mode)) + colored_filetype = C_FIFO; ++#if defined(S_ISSOCK) + else if (S_ISSOCK (mode)) + colored_filetype = C_SOCK; ++#endif + else if (S_ISBLK (mode)) + colored_filetype = C_BLK; + else if (S_ISCHR (mode)) -- cgit v1.2.3