|
 |
f55928 |
diff -ru vim-8.2.4230.orig/src/auto/configure vim-8.2.4230/src/auto/configure
|
|
|
f55928 |
--- vim-8.2.4230.orig/src/auto/configure 2022-01-27 16:04:22.000000000 +0100
|
|
|
f55928 |
+++ vim-8.2.4230/src/auto/configure 2022-01-27 17:15:07.217234738 +0100
|
|
|
f55928 |
@@ -3772,7 +3772,7 @@
|
|
|
f55928 |
fi
|
|
|
f55928 |
|
|
|
f55928 |
ac_ext=c
|
|
|
f55928 |
-ac_cpp='$CPP $CPPFLAGS'
|
|
|
f55928 |
+ac_cpp='$CPP $CFLAGS $CPPFLAGS'
|
|
|
f55928 |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
|
f55928 |
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
|
f55928 |
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
f55928 |
@@ -8343,6 +8343,7 @@
|
|
|
f55928 |
|
|
|
f55928 |
# Standard set of common directories for X headers.
|
|
|
f55928 |
# Check X11 before X11Rn because it is often a symlink to the current release.
|
|
|
f55928 |
+if test -z "$ac_x_header_dirs"; then
|
|
|
f55928 |
ac_x_header_dirs='
|
|
|
f55928 |
/usr/X11/include
|
|
|
f55928 |
/usr/X11R7/include
|
|
|
f55928 |
@@ -8381,6 +8382,7 @@
|
|
|
f55928 |
|
|
|
f55928 |
/usr/openwin/include
|
|
|
f55928 |
/usr/openwin/share/include'
|
|
|
f55928 |
+fi
|
|
|
f55928 |
|
|
|
f55928 |
if test "$ac_x_includes" = no; then
|
|
|
f55928 |
# Guess where to find include files, by looking for Xlib.h.
|
|
|
f55928 |
@@ -13037,93 +13039,7 @@
|
|
|
f55928 |
fi
|
|
|
f55928 |
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
f55928 |
|
|
|
f55928 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timer_create" >&5
|
|
|
f55928 |
-$as_echo_n "checking for timer_create... " >&6; }
|
|
|
f55928 |
-save_LIBS="$LIBS"
|
|
|
f55928 |
-LIBS="$LIBS -lrt"
|
|
|
f55928 |
-if test "$cross_compiling" = yes; then :
|
|
|
f55928 |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
f55928 |
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
f55928 |
-as_fn_error $? "cannot run test program while cross compiling
|
|
|
f55928 |
-See \`config.log' for more details" "$LINENO" 5; }
|
|
|
f55928 |
-else
|
|
|
f55928 |
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
f55928 |
-/* end confdefs.h. */
|
|
|
f55928 |
-
|
|
|
f55928 |
-#include<signal.h>
|
|
|
f55928 |
-#include<time.h>
|
|
|
f55928 |
-static void set_flag(union sigval sv) {}
|
|
|
f55928 |
-
|
|
|
f55928 |
-int
|
|
|
f55928 |
-main ()
|
|
|
f55928 |
-{
|
|
|
f55928 |
-
|
|
|
f55928 |
- struct timespec ts;
|
|
|
f55928 |
- struct sigevent action = {0};
|
|
|
f55928 |
- timer_t timer_id;
|
|
|
f55928 |
-
|
|
|
f55928 |
- action.sigev_notify = SIGEV_THREAD;
|
|
|
f55928 |
- action.sigev_notify_function = set_flag;
|
|
|
f55928 |
- if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0)
|
|
|
f55928 |
- exit(1); // cannot create a monotonic timer
|
|
|
f55928 |
-
|
|
|
f55928 |
- ;
|
|
|
f55928 |
- return 0;
|
|
|
f55928 |
-}
|
|
|
f55928 |
-_ACEOF
|
|
|
f55928 |
-if ac_fn_c_try_run "$LINENO"; then :
|
|
|
f55928 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; with -lrt" >&5
|
|
|
f55928 |
-$as_echo "yes; with -lrt" >&6; }; $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
|
|
|
f55928 |
-
|
|
|
f55928 |
-else
|
|
|
f55928 |
- LIBS="$save_LIBS"
|
|
|
f55928 |
- if test "$cross_compiling" = yes; then :
|
|
|
f55928 |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
f55928 |
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
f55928 |
-as_fn_error $? "cannot run test program while cross compiling
|
|
|
f55928 |
-See \`config.log' for more details" "$LINENO" 5; }
|
|
|
f55928 |
-else
|
|
|
f55928 |
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
f55928 |
-/* end confdefs.h. */
|
|
|
f55928 |
-
|
|
|
f55928 |
-#include<signal.h>
|
|
|
f55928 |
-#include<time.h>
|
|
|
f55928 |
-static void set_flag(union sigval sv) {}
|
|
|
f55928 |
-
|
|
|
f55928 |
-int
|
|
|
f55928 |
-main ()
|
|
|
f55928 |
-{
|
|
|
f55928 |
-
|
|
|
f55928 |
- struct timespec ts;
|
|
|
f55928 |
- struct sigevent action = {0};
|
|
|
f55928 |
- timer_t timer_id;
|
|
|
f55928 |
-
|
|
|
f55928 |
- action.sigev_notify = SIGEV_THREAD;
|
|
|
f55928 |
- action.sigev_notify_function = set_flag;
|
|
|
f55928 |
- if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0)
|
|
|
f55928 |
- exit(1); // cannot create a monotonic timer
|
|
|
f55928 |
-
|
|
|
f55928 |
- ;
|
|
|
f55928 |
- return 0;
|
|
|
f55928 |
-}
|
|
|
f55928 |
-_ACEOF
|
|
|
f55928 |
-if ac_fn_c_try_run "$LINENO"; then :
|
|
|
f55928 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
|
f55928 |
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
|
|
|
f55928 |
-
|
|
|
f55928 |
-else
|
|
|
f55928 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
f55928 |
-$as_echo "no" >&6; }
|
|
|
f55928 |
-fi
|
|
|
f55928 |
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
|
f55928 |
- conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
|
f55928 |
-fi
|
|
|
f55928 |
-
|
|
|
f55928 |
-fi
|
|
|
f55928 |
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
|
f55928 |
- conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
|
f55928 |
-fi
|
|
|
f55928 |
-
|
|
|
f55928 |
+$as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
|
|
|
f55928 |
|
|
|
f55928 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat() ignores a trailing slash" >&5
|
|
|
f55928 |
$as_echo_n "checking whether stat() ignores a trailing slash... " >&6; }
|
|
|
f55928 |
diff -ru vim-8.2.4230.orig/src/Makefile vim-8.2.4230/src/Makefile
|
|
|
f55928 |
--- vim-8.2.4230.orig/src/Makefile 2022-01-27 16:04:22.000000000 +0100
|
|
|
f55928 |
+++ vim-8.2.4230/src/Makefile 2022-01-27 17:13:59.313233849 +0100
|
|
|
f55928 |
@@ -3093,7 +3093,7 @@
|
|
|
f55928 |
$(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
|
|
|
f55928 |
|
|
|
f55928 |
auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
|
|
|
f55928 |
- CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
|
|
|
f55928 |
+ CC="$(CC) $(OSDEF_CFLAGS) -I$(PKG_PREFIX)/include" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
|
|
|
f55928 |
|
|
|
f55928 |
auto/os_haiku.rdef: os_haiku.rdef.in
|
|
|
f55928 |
@echo creating $@
|