Mercurial > mxe-octave
annotate src/fontconfig-1.patch @ 4612:56320dd51677
nsis: plugin requires static gcc linking
* src/nsis-2-fixes.patch: add back static linking against libgcc
| author | John D |
|---|---|
| date | Sat, 03 Mar 2018 19:42:43 -0500 |
| parents | 472c440a678b |
| children | 799eb11f34bf |
| rev | line source |
|---|---|
| 4266 | 1 This file is part of MXE. See LICENSE.md for licensing information. |
| 2 | |
| 3 From da6c9bfc3d57f3aa192972717cb5c84a56e1c422 Mon Sep 17 00:00:00 2001 | |
| 4 From: MXE | |
| 5 Date: Tue, 05 Jul 2016 21:56:34 +0300 | |
| 6 Subject: [PATCH] fix mktemp_s | |
| 7 | |
| 8 | |
| 9 diff --git a/configure.ac b/configure.ac | |
| 10 index f8dadf1..bde05c8 100644 | |
| 11 --- a/configure.ac | |
| 12 +++ b/configure.ac | |
| 13 @@ -160,7 +160,7 @@ AC_TYPE_PID_T | |
| 14 # Checks for library functions. | |
| 15 AC_FUNC_VPRINTF | |
| 16 AC_FUNC_MMAP | |
| 17 -AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat]) | |
| 18 +AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat]) | |
|
3329
7bbaffce14a8
Don't create temporary fontconfig install dir which is never removed.
Rik <rik@octave.org>
parents:
diff
changeset
|
19 |
| 4266 | 20 dnl AC_CHECK_FUNCS doesn't check for header files. |
| 21 dnl posix_fadvise() may be not available in older libc. | |
| 22 diff --git a/src/fccompat.c b/src/fccompat.c | |
| 23 index f4f3f5f..68a70ff 100644 | |
| 24 --- a/src/fccompat.c | |
| 25 +++ b/src/fccompat.c | |
| 26 @@ -152,8 +152,8 @@ FcMakeTempfile (char *template) | |
| 27 fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); | |
| 28 } | |
| 29 # endif | |
| 30 -#elif HAVE__MKTEMP_S | |
| 31 - if (_mktemp_s(template, strlen(template) + 1) != 0) | |
| 32 +#elif HAVE__MKTEMP | |
| 33 + if (_mktemp(template) != 0) | |
| 34 return -1; | |
| 35 fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600); | |
| 36 #endif | |
| 37 -- | |
| 38 1.8.4.5 | |
|
3505
5a35cc5310da
fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents:
3485
diff
changeset
|
39 |