|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen stable-4.16] tools: drop bogus and obsolete ptyfuncs.m4
commit 36191ac79bb80d6fe4c2292c752815cd11b558e2
Author: Olaf Hering <olaf@xxxxxxxxx>
AuthorDate: Fri May 12 12:26:14 2023 +0000
Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Aug 8 12:33:49 2023 +0100
tools: drop bogus and obsolete ptyfuncs.m4
According to openpty(3) it is required to include <pty.h> to get the
prototypes for openpty() and login_tty(). But this is not what the
function AX_CHECK_PTYFUNCS actually does. It makes no attempt to include
the required header.
The two source files which call openpty() and login_tty() already contain
the conditionals to include the required header.
Remove the bogus m4 file to fix build with clang, which complains about
calls to undeclared functions.
Remove usage of INCLUDE_LIBUTIL_H in libxl_bootloader.c, it is already
covered by inclusion of libxl_osdep.h.
Remove usage of PTYFUNCS_LIBS in libxl/Makefile, it is already covered
by UTIL_LIBS from config/StdGNU.mk.
Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
(cherry picked from commit 42abf5b9c53eb1b1a902002fcda68708234152c3)
---
config/Tools.mk.in | 2 --
m4/ptyfuncs.m4 | 35 -------------------
tools/config.h.in | 3 --
tools/configure | 68 -------------------------------------
tools/configure.ac | 2 --
tools/libs/light/Makefile | 2 +-
tools/libs/light/libxl_bootloader.c | 4 ---
7 files changed, 1 insertion(+), 115 deletions(-)
diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 934d899967..3853362528 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -30,8 +30,6 @@ PTHREAD_CFLAGS := @PTHREAD_CFLAGS@
PTHREAD_LDFLAGS := @PTHREAD_LDFLAGS@
PTHREAD_LIBS := @PTHREAD_LIBS@
-PTYFUNCS_LIBS := @PTYFUNCS_LIBS@
-
LIBNL3_LIBS := @LIBNL3_LIBS@
LIBNL3_CFLAGS := @LIBNL3_CFLAGS@
XEN_TOOLS_RPATH := @rpath@
diff --git a/m4/ptyfuncs.m4 b/m4/ptyfuncs.m4
deleted file mode 100644
index 3e37b5a23c..0000000000
--- a/m4/ptyfuncs.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-AC_DEFUN([AX_CHECK_PTYFUNCS], [
- dnl This is a workaround for a bug in Debian package
- dnl libbsd-dev-0.3.0-1. Once we no longer support that
- dnl package we can remove the addition of -Werror to
- dnl CPPFLAGS.
- AX_SAVEVAR_SAVE(CPPFLAGS)
- CPPFLAGS="$CPPFLAGS -Werror"
- AC_CHECK_HEADER([libutil.h],[
- AC_DEFINE([INCLUDE_LIBUTIL_H],[<libutil.h>],[libutil header file name])
- ])
- AX_SAVEVAR_RESTORE(CPPFLAGS)
- AC_CACHE_CHECK([for openpty et al], [ax_cv_ptyfuncs_libs], [
- for ax_cv_ptyfuncs_libs in -lutil "" NOT_FOUND; do
- if test "x$ax_cv_ptyfuncs_libs" = "xNOT_FOUND"; then
- AC_MSG_FAILURE([Unable to find library for openpty and
login_tty])
- fi
- AX_SAVEVAR_SAVE(LIBS)
- LIBS="$LIBS $ax_cv_ptyfuncs_libs"
- AC_LINK_IFELSE([AC_LANG_SOURCE([
-#ifdef INCLUDE_LIBUTIL_H
-#include INCLUDE_LIBUTIL_H
-#endif
-int main(void) {
- openpty(0,0,0,0,0);
- login_tty(0);
-}
-])],[
- break
- ],[])
- AX_SAVEVAR_RESTORE(LIBS)
- done
- ])
- PTYFUNCS_LIBS="$ax_cv_ptyfuncs_libs"
- AC_SUBST(PTYFUNCS_LIBS)
-])
diff --git a/tools/config.h.in b/tools/config.h.in
index 52e01b2c84..89eef9c2ec 100644
--- a/tools/config.h.in
+++ b/tools/config.h.in
@@ -90,9 +90,6 @@
/* Define extfs header to use */
#undef INCLUDE_EXTFS_H
-/* libutil header file name */
-#undef INCLUDE_LIBUTIL_H
-
/* IPXE path */
#undef IPXE_PATH
diff --git a/tools/configure b/tools/configure
index 40f970b14b..1b5e33da8f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -636,7 +636,6 @@ LIBNL3_LIBS
LIBNL3_CFLAGS
argp_ldflags
libiconv
-PTYFUNCS_LIBS
PTHREAD_LIBS
PTHREAD_LDFLAGS
PTHREAD_CFLAGS
@@ -3749,8 +3748,6 @@ esac
-
-
# Fetched from
http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_compare_version.m4
# Commit ID: 27948f49ca30e4222bb7cdd55182bd7341ac50c5
# ===========================================================================
@@ -8944,71 +8941,6 @@ $as_echo "$ax_cv_pthread_flags" >&6; }
-
-
- saved_CPPFLAGS="$CPPFLAGS"
-
- CPPFLAGS="$CPPFLAGS -Werror"
- ac_fn_c_check_header_mongrel "$LINENO" "libutil.h"
"ac_cv_header_libutil_h" "$ac_includes_default"
-if test "x$ac_cv_header_libutil_h" = xyes; then :
-
-
-$as_echo "#define INCLUDE_LIBUTIL_H <libutil.h>" >>confdefs.h
-
-
-fi
-
-
-
- CPPFLAGS="$saved_CPPFLAGS"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty et al" >&5
-$as_echo_n "checking for openpty et al... " >&6; }
-if ${ax_cv_ptyfuncs_libs+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- for ax_cv_ptyfuncs_libs in -lutil "" NOT_FOUND; do
- if test "x$ax_cv_ptyfuncs_libs" = "xNOT_FOUND"; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in
\`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Unable to find library for openpty and login_tty
-See \`config.log' for more details" "$LINENO" 5; }
- fi
-
- saved_LIBS="$LIBS"
-
- LIBS="$LIBS $ax_cv_ptyfuncs_libs"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#ifdef INCLUDE_LIBUTIL_H
-#include INCLUDE_LIBUTIL_H
-#endif
-int main(void) {
- openpty(0,0,0,0,0);
- login_tty(0);
-}
-
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
- break
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$saved_LIBS"
-
- done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_ptyfuncs_libs" >&5
-$as_echo "$ax_cv_ptyfuncs_libs" >&6; }
- PTYFUNCS_LIBS="$ax_cv_ptyfuncs_libs"
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5
$as_echo_n "checking for yajl_alloc in -lyajl... " >&6; }
if ${ac_cv_lib_yajl_yajl_alloc+:} false; then :
diff --git a/tools/configure.ac b/tools/configure.ac
index 3ac62626a5..2662e61e65 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -67,7 +67,6 @@ m4_include([../m4/uuid.m4])
m4_include([../m4/pkg.m4])
m4_include([../m4/curses.m4])
m4_include([../m4/pthread.m4])
-m4_include([../m4/ptyfuncs.m4])
m4_include([../m4/extfs.m4])
m4_include([../m4/fetcher.m4])
m4_include([../m4/ax_compare_version.m4])
@@ -405,7 +404,6 @@ AC_SUBST(zlib)
AC_SUBST(system_aio)
AX_CHECK_EXTFS
AX_CHECK_PTHREAD
-AX_CHECK_PTYFUNCS
AC_CHECK_LIB([yajl], [yajl_alloc], [],
[AC_MSG_ERROR([Could not find yajl])])
AC_CHECK_LIB([z], [deflateCopy], [], [AC_MSG_ERROR([Could not find zlib])])
diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile
index dd43f37b4c..8cc50dc9ea 100644
--- a/tools/libs/light/Makefile
+++ b/tools/libs/light/Makefile
@@ -167,7 +167,7 @@ NO_HEADERS_CHK := y
include $(XEN_ROOT)/tools/libs/libs.mk
-LDUSELIBS-y += $(PTYFUNCS_LIBS)
+LDUSELIBS-y += $(UTIL_LIBS)
LDUSELIBS-$(CONFIG_LIBNL) += $(LIBNL3_LIBS)
LDUSELIBS-$(CONFIG_Linux) += -luuid
LDUSELIBS-$(CONFIG_Linux) += -lrt
diff --git a/tools/libs/light/libxl_bootloader.c
b/tools/libs/light/libxl_bootloader.c
index 18e9ebd714..1bc6e51827 100644
--- a/tools/libs/light/libxl_bootloader.c
+++ b/tools/libs/light/libxl_bootloader.c
@@ -19,10 +19,6 @@
#include <utmp.h>
#endif
-#ifdef INCLUDE_LIBUTIL_H
-#include INCLUDE_LIBUTIL_H
-#endif
-
#include "libxl_internal.h"
#define BOOTLOADER_BUF_OUT 65536
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.16
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |