diff options
Diffstat (limited to 'sys-process/htop/files/htop-2.1.0-bashisms.patch')
| -rw-r--r-- | sys-process/htop/files/htop-2.1.0-bashisms.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/sys-process/htop/files/htop-2.1.0-bashisms.patch b/sys-process/htop/files/htop-2.1.0-bashisms.patch new file mode 100644 index 000000000000..3b5bdabe82fd --- /dev/null +++ b/sys-process/htop/files/htop-2.1.0-bashisms.patch @@ -0,0 +1,37 @@ +From d4ea7cd65ccf8551cabb0706167b2c15aad7866d Mon Sep 17 00:00:00 2001 +From: Jesin <jesin00@gmail.com> +Date: Mon, 26 Feb 2018 18:07:52 -0500 +Subject: [PATCH] Fix bashisms (#749) + +The configure script relied on bash-specific extensions to shell syntax +and behavior, causing build failures on systems with other /bin/sh +implementations. This commit replaces those with equivalent constructs +that should work in all POSIX shells. +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d4bb36b0..3d69756d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -66,7 +66,7 @@ dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to + dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet + dnl been updated in Autoconf 2.69, so use a workaround: + m4_version_prereq([2.70], [], +-[if test $ac_cv_header_sys_mkdev_h = no; then ++[if test "x$ac_cv_header_sys_mkdev_h" = xno; then + AC_CHECK_HEADER(sys/sysmacros.h, [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, + [Define to 1 if `major', `minor', and `makedev' are declared in <sys/sysmacros.h>.])]) + fi]) +@@ -278,8 +278,8 @@ then + PKG_PROG_PKG_CONFIG() + PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [], [missing_libraries="$missing_libraries libnl-3"]) + PKG_CHECK_MODULES(LIBNL3GENL, libnl-genl-3.0, [], [missing_libraries="$missing_libraries libnl-genl-3"]) +- CFLAGS+=" $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS" +- LIBS+=" $LIBNL3_LIBS $LIBNL3GENL_LIBS" ++ CFLAGS="$CFLAGS $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS" ++ LIBS="$LIBS $LIBNL3_LIBS $LIBNL3GENL_LIBS" + AC_DEFINE(HAVE_DELAYACCT, 1, [Define if delay accounting support should be enabled.]) + fi + |