expect: Fix `configure` and build for Clang 16
%ci:no-build
This commit is contained in:
Tee KOBAYASHI
xtkoba
parent
7d71633130
commit
53a8d19a0c
|
|
@ -9,10 +9,11 @@ TERMUX_PKG_SHA256=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c
|
|||
TERMUX_PKG_DEPENDS="tcl"
|
||||
TERMUX_PKG_BREAKS="expect-dev"
|
||||
TERMUX_PKG_REPLACES="expect-dev"
|
||||
TERMUX_PKG_ENABLE_CLANG16_PORTING=false
|
||||
|
||||
termux_step_pre_configure() {
|
||||
autoconf
|
||||
|
||||
CPPFLAGS+=" -DHAVE_SYS_WAIT_H"
|
||||
}
|
||||
|
||||
termux_step_post_make_install() {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,95 @@
|
|||
https://github.com/termux/termux-packages/issues/15852
|
||||
Borrowed from https://github.com/gentoo/gentoo/blob/71069946a4cd814d6185378f6b26260bdad40584/dev-tcltk/expect/files/expect-5.45-headers.patch
|
||||
|
||||
https://sourceforge.net/tracker/?func=detail&aid=3071706&group_id=13179&atid=113179
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -133,6 +133,8 @@ AC_CHECK_HEADER(sys/fcntl.h, AC_DEFINE(HAVE_SYS_FCNTL_H))
|
||||
AC_CHECK_HEADER(sys/ptem.h, AC_DEFINE(HAVE_SYS_PTEM_H))
|
||||
AC_CHECK_HEADER(sys/strredir.h, AC_DEFINE(HAVE_STRREDIR_H))
|
||||
AC_CHECK_HEADER(sys/strpty.h, AC_DEFINE(HAVE_STRPTY_H))
|
||||
+AC_CHECK_HEADER(pty.h, AC_DEFINE(HAVE_PTY_H))
|
||||
+AC_CHECK_HEADER(libutil.h, AC_DEFINE(HAVE_LIBUTIL_H))
|
||||
|
||||
AC_MSG_CHECKING([for sys/bsdtypes.h])
|
||||
if test "ISC_${ISC}" = "ISC_1" ; then
|
||||
--- a/exp_clib.c
|
||||
+++ b/exp_clib.c
|
||||
@@ -15,6 +15,12 @@
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
#include <sys/ioctl.h>
|
||||
+#ifdef HAVE_UNISTD_H
|
||||
+# include <unistd.h>
|
||||
+#endif
|
||||
+#ifdef HAVE_SYS_WAIT_H
|
||||
+#include <sys/wait.h>
|
||||
+#endif
|
||||
|
||||
#ifdef TIME_WITH_SYS_TIME
|
||||
# include <sys/time.h>
|
||||
--- a/exp_trap.c
|
||||
+++ b/exp_trap.c
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
#include <sys/types.h>
|
||||
+#include <string.h>
|
||||
|
||||
#ifdef HAVE_SYS_WAIT_H
|
||||
#include <sys/wait.h>
|
||||
--- a/pty_termios.c
|
||||
+++ b/pty_termios.c
|
||||
@@ -9,6 +9,14 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
+#include <string.h>
|
||||
+#ifdef HAVE_PTY_H
|
||||
+#include <pty.h>
|
||||
+#endif
|
||||
+#ifdef HAVE_LIBUTIL_H
|
||||
+#include <sys/types.h>
|
||||
+#include <libutil.h>
|
||||
+#endif
|
||||
|
||||
#if defined(SIGCLD) && !defined(SIGCHLD)
|
||||
#define SIGCHLD SIGCLD
|
||||
@@ -100,6 +100,7 @@
|
||||
|
||||
#include "exp_tty_in.h"
|
||||
#include "exp_rename.h"
|
||||
+#include "exp_int.h"
|
||||
#include "exp_pty.h"
|
||||
|
||||
void expDiagLog();
|
||||
--- a/exp_chan.c
|
||||
+++ b/exp_chan.c
|
||||
@@ -34,6 +34,7 @@
|
||||
#include "exp_rename.h"
|
||||
#include "exp_prog.h"
|
||||
#include "exp_command.h"
|
||||
+#include "exp_event.h"
|
||||
#include "exp_log.h"
|
||||
#include "tcldbg.h" /* Dbg_StdinMode */
|
||||
|
||||
--- a/exp_clib.c
|
||||
+++ b/exp_clib.c
|
||||
@@ -1955,6 +1955,7 @@
|
||||
|
||||
#include "expect.h"
|
||||
#include "exp_int.h"
|
||||
+EXTERN void exp_init_tty _ANSI_ARGS_((void));
|
||||
|
||||
/* exp_glob.c - expect functions for doing glob
|
||||
*
|
||||
--- a/exp_tty.h
|
||||
+++ b/exp_tty.h
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
void exp_tty_raw(int set);
|
||||
void exp_tty_echo(int set);
|
||||
+int exp_tty_cooked_echo(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
|
||||
void exp_tty_break(Tcl_Interp *interp, int fd);
|
||||
int exp_tty_raw_noecho(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
|
||||
int exp_israw(void);
|
||||
|
|
@ -0,0 +1,226 @@
|
|||
https://github.com/termux/termux-packages/issues/15852
|
||||
Borrowed from https://github.com/gentoo/gentoo/blob/8d4beeac7560e8fcd93eeede0a03ed0f8692d1db/dev-tcltk/expect/files/expect-5.45.4-configure-clang16.patch
|
||||
|
||||
From 4c3a5051aa9706eea42dab31f9e121d975c08521 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Thu, 17 Nov 2022 20:20:45 +0000
|
||||
Subject: [PATCH] Fix configure with clang 16
|
||||
|
||||
Bug: https://bugs.gentoo.org/881687
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -454,7 +454,7 @@ AC_CHECK_FUNC(siglongjmp, AC_DEFINE(HAVE_SIGLONGJMP))
|
||||
# because Unixware 2.0 handles it specially and refuses to compile
|
||||
# autoconf's automatic test that is a call with no arguments
|
||||
AC_MSG_CHECKING([for memcpy])
|
||||
-AC_TRY_LINK(,[
|
||||
+AC_TRY_LINK([#include <string.h>],[
|
||||
char *s1, *s2;
|
||||
memcpy(s1,s2,0);
|
||||
],
|
||||
@@ -471,7 +471,7 @@ memcpy(s1,s2,0);
|
||||
AC_MSG_CHECKING([if WNOHANG requires _POSIX_SOURCE])
|
||||
AC_TRY_RUN([
|
||||
#include <sys/wait.h>
|
||||
-main() {
|
||||
+int main(void) {
|
||||
#ifndef WNOHANG
|
||||
return 0;
|
||||
#else
|
||||
@@ -491,7 +491,7 @@ rm -rf wnohang
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <sys/wait.h>
|
||||
-main() {
|
||||
+int main(void) {
|
||||
#ifdef WNOHANG
|
||||
FILE *fp = fopen("wnohang","w");
|
||||
fprintf(fp,"%d",WNOHANG);
|
||||
@@ -540,24 +540,23 @@ dnl AC_HEADER_EGREP([(void|sighandler_t).*signal], signal.h, retsigtype=void,AC_
|
||||
AC_MSG_CHECKING([if signals need to be re-armed])
|
||||
AC_TRY_RUN([
|
||||
#include <signal.h>
|
||||
-#define RETSIGTYPE $retsigtype
|
||||
-
|
||||
+#include <stdlib.h>
|
||||
+#include <sys/wait.h>
|
||||
+#include <unistd.h>
|
||||
int signal_rearms = 0;
|
||||
|
||||
RETSIGTYPE
|
||||
-child_sigint_handler(n)
|
||||
-int n;
|
||||
+child_sigint_handler(int n)
|
||||
{
|
||||
}
|
||||
|
||||
RETSIGTYPE
|
||||
-parent_sigint_handler(n)
|
||||
-int n;
|
||||
+parent_sigint_handler(int n)
|
||||
{
|
||||
signal_rearms++;
|
||||
}
|
||||
|
||||
-main()
|
||||
+int main(void)
|
||||
{
|
||||
signal(SIGINT,parent_sigint_handler);
|
||||
|
||||
@@ -719,7 +718,8 @@ fi
|
||||
AC_MSG_CHECKING([for struct sgttyb])
|
||||
AC_TRY_RUN([
|
||||
#include <sgtty.h>
|
||||
-main()
|
||||
+#include <stdlib.h>
|
||||
+int main(void)
|
||||
{
|
||||
struct sgttyb tmp;
|
||||
exit(0);
|
||||
@@ -745,7 +745,8 @@ if test $mach -eq 0 ; then
|
||||
# pty_termios.c is set up to handle pty_termio.
|
||||
AC_MSG_CHECKING([for struct termio])
|
||||
AC_TRY_RUN([#include <termio.h>
|
||||
- main()
|
||||
+ #include <stdlib.h>
|
||||
+ int main(void)
|
||||
{
|
||||
struct termio tmp;
|
||||
exit(0);
|
||||
@@ -769,7 +770,8 @@ if test $mach -eq 0 ; then
|
||||
# include <inttypes.h>
|
||||
# endif
|
||||
# include <termios.h>
|
||||
- main()
|
||||
+# include <stdlib.h>
|
||||
+ int main(void)
|
||||
{
|
||||
struct termios tmp;
|
||||
exit(0);
|
||||
@@ -793,7 +795,7 @@ AC_TRY_RUN([
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
#include <termios.h>
|
||||
-main() {
|
||||
+int main(void) {
|
||||
#if defined(TCGETS) || defined(TCGETA)
|
||||
return 0;
|
||||
#else
|
||||
@@ -815,7 +817,7 @@ AC_TRY_RUN([
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
#include <termios.h>
|
||||
-main() {
|
||||
+int main(void) {
|
||||
#ifdef TIOCGWINSZ
|
||||
return 0;
|
||||
#else
|
||||
@@ -834,7 +836,7 @@ main() {
|
||||
AC_MSG_CHECKING([for Cray-style ptys])
|
||||
SETUID=":"
|
||||
AC_TRY_RUN([
|
||||
-main(){
|
||||
+int main(void) {
|
||||
#ifdef CRAY
|
||||
return 0;
|
||||
#else
|
||||
@@ -887,9 +889,10 @@ AC_FUNC_SETPGRP
|
||||
#
|
||||
AC_MSG_CHECKING([for SV-style timezone])
|
||||
AC_TRY_RUN([
|
||||
+#include <stdlib.h>
|
||||
extern char *tzname[2];
|
||||
extern int daylight;
|
||||
-main()
|
||||
+int main(void)
|
||||
{
|
||||
int *x = &daylight;
|
||||
char **y = tzname;
|
||||
--- a/tclconfig/tcl.m4
|
||||
+++ b/tclconfig/tcl.m4
|
||||
@@ -2029,7 +2029,7 @@ AC_DEFUN([TEA_SERIAL_PORT], [
|
||||
AC_TRY_RUN([
|
||||
#include <termios.h>
|
||||
|
||||
-int main() {
|
||||
+int main(void) {
|
||||
struct termios t;
|
||||
if (tcgetattr(0, &t) == 0) {
|
||||
cfsetospeed(&t, 0);
|
||||
@@ -2042,7 +2042,7 @@ int main() {
|
||||
AC_TRY_RUN([
|
||||
#include <termio.h>
|
||||
|
||||
-int main() {
|
||||
+int main(void) {
|
||||
struct termio t;
|
||||
if (ioctl(0, TCGETA, &t) == 0) {
|
||||
t.c_cflag |= CBAUD | PARENB | PARODD | CSIZE | CSTOPB;
|
||||
@@ -2055,7 +2055,7 @@ int main() {
|
||||
AC_TRY_RUN([
|
||||
#include <sgtty.h>
|
||||
|
||||
-int main() {
|
||||
+int main(void) {
|
||||
struct sgttyb t;
|
||||
if (ioctl(0, TIOCGETP, &t) == 0) {
|
||||
t.sg_ospeed = 0;
|
||||
@@ -2070,7 +2070,7 @@ int main() {
|
||||
#include <termios.h>
|
||||
#include <errno.h>
|
||||
|
||||
-int main() {
|
||||
+int main(void) {
|
||||
struct termios t;
|
||||
if (tcgetattr(0, &t) == 0
|
||||
|| errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
|
||||
@@ -2086,7 +2086,7 @@ int main() {
|
||||
#include <termio.h>
|
||||
#include <errno.h>
|
||||
|
||||
-int main() {
|
||||
+int main(void) {
|
||||
struct termio t;
|
||||
if (ioctl(0, TCGETA, &t) == 0
|
||||
|| errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
|
||||
@@ -2101,7 +2101,7 @@ int main() {
|
||||
#include <sgtty.h>
|
||||
#include <errno.h>
|
||||
|
||||
-int main() {
|
||||
+int main(void) {
|
||||
struct sgttyb t;
|
||||
if (ioctl(0, TIOCGETP, &t) == 0
|
||||
|| errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
|
||||
@@ -2392,7 +2392,9 @@ AC_DEFUN([TEA_TIME_HANDLER], [
|
||||
# (like convex) have timezone functions, etc.
|
||||
#
|
||||
AC_CACHE_CHECK([long timezone variable], tcl_cv_timezone_long, [
|
||||
- AC_TRY_COMPILE([#include <time.h>],
|
||||
+ AC_TRY_COMPILE([#include <time.h>
|
||||
+ #include <stdlib.h>
|
||||
+ ],
|
||||
[extern long timezone;
|
||||
timezone += 1;
|
||||
exit (0);],
|
||||
@@ -2404,7 +2406,9 @@ AC_DEFUN([TEA_TIME_HANDLER], [
|
||||
# On some systems (eg IRIX 6.2), timezone is a time_t and not a long.
|
||||
#
|
||||
AC_CACHE_CHECK([time_t timezone variable], tcl_cv_timezone_time, [
|
||||
- AC_TRY_COMPILE([#include <time.h>],
|
||||
+ AC_TRY_COMPILE([#include <time.h>
|
||||
+ #include <stdlib.h>
|
||||
+ ],
|
||||
[extern time_t timezone;
|
||||
timezone += 1;
|
||||
exit (0);],
|
||||
@@ -2441,7 +2445,7 @@ AC_DEFUN([TEA_BUGGY_STRTOD], [
|
||||
AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[
|
||||
AC_TRY_RUN([
|
||||
extern double strtod();
|
||||
- int main() {
|
||||
+ int main(void) {
|
||||
char *infString="Inf", *nanString="NaN", *spaceString=" ";
|
||||
char *term;
|
||||
double value;
|
||||
Loading…
Reference in New Issue