diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
| commit | 940b4d1848e8c70ab7642901a68594e8016caffc (patch) | |
| tree | eb72f344ee6c3d9b80a7ecc079ea79e9fba8676d /external/libassuan/fix-autoconf-macros.patch | |
| parent | Initial commit. (diff) | |
| download | libreoffice-940b4d1848e8c70ab7642901a68594e8016caffc.tar.xz libreoffice-940b4d1848e8c70ab7642901a68594e8016caffc.zip | |
Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/libassuan/fix-autoconf-macros.patch')
| -rw-r--r-- | external/libassuan/fix-autoconf-macros.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/external/libassuan/fix-autoconf-macros.patch b/external/libassuan/fix-autoconf-macros.patch new file mode 100644 index 000000000..4a2d035b5 --- /dev/null +++ b/external/libassuan/fix-autoconf-macros.patch @@ -0,0 +1,56 @@ +diff -ur libassuan.org/configure.ac libassuan/configure.ac +--- configure.ac 2017-02-16 18:32:51.549527554 +0100 ++++ configure.ac~ 2017-02-16 18:32:59.893497890 +0100 +@@ -44,6 +44,14 @@ + # the decimalized short revision number, a beta version string and a + # flag indicating a development version (mym4_isbeta). Note that the + # m4 processing is done by autoconf and not during the configure run. ++m4_define([m4_chomp_all], ++[m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [ ++/], [/ ]), [/*$]), [$1])]) ++ ++m4_define([m4_argn], ++[m4_assert([0 < $1])]dnl ++[m4_pushdef([_$0], [_m4_popdef([_$0])]m4_dquote([$]m4_incr([$1])))_$0($@)]) ++m4_define([m4_esyscmd_s], [m4_chomp_all(m4_esyscmd([$1]))]) + m4_define([mym4_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \ + mym4_package mym4_major mym4_minor mym4_micro),[:])) + m4_define([mym4_isbeta], m4_argn(2, mym4_verslist)) +@@ -75,7 +80,22 @@ + VERSION=$PACKAGE_VERSION + + AC_CONFIG_AUX_DIR([build-aux]) +-AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) ++ ++dnl Initialize automake. automake < 1.12 didn't have serial-tests and ++dnl gives an error if it sees this, but for automake >= 1.13 ++dnl serial-tests is required so we have to include it. Solution is to ++dnl test for the version of automake (by running an external command) ++dnl and provide it if necessary. Note we have to do this entirely using ++dnl m4 macros since automake queries this macro by running ++dnl 'autoconf --trace ...'. ++m4_define([serial_tests], [ ++ m4_esyscmd([automake --version | ++ head -1 | ++ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}' ++ ]) ++]) ++AM_INIT_AUTOMAKE(foreign serial_tests dist-bzip2 no-dist-gzip) dnl NB: Do not [quote] this parameter. ++ + AM_MAINTAINER_MODE + AC_CONFIG_SRCDIR(src/assuan.h.in) + AC_CONFIG_MACRO_DIR(m4) +@@ -475,10 +475,12 @@ + [Defined if LOCAL_PEEREID is supported (NetBSD specific)]) + else + # (Open)Solaris +- AC_CHECK_FUNCS([getpeerucred], AC_CHECK_HEADERS([ucred.h])) ++ AC_CHECK_FUNCS([getpeerucred]) + if test $ac_cv_func_getpeerucred != yes; then + # FreeBSD + AC_CHECK_FUNCS([getpeereid]) ++ else ++ AC_CHECK_HEADERS([ucred.h]) + fi + fi + fi |