Browse Source

- util-linux: drop obsolete patch

master
gixxpunk 8 years ago
parent
commit
f03831b43c
  1. 50
      archive-patches/util-linux-define-mkostemp-for-older-version-of-uClibc.patch
  2. 1
      make/system-tools-extra.mk

50
archive-patches/util-linux-define-mkostemp-for-older-version-of-uClibc.patch

@ -1,50 +0,0 @@
From 42a84250fc78bae3e885ecd1379e713663fe6487 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Sun, 6 Apr 2014 12:12:41 +0200
Subject: [PATCH 1/1] c.h: define mkostemp for older version of uClibc
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
configure.ac | 2 ++
include/c.h | 14 ++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/configure.ac b/configure.ac
index 35a1f26..a9b8d34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,6 +321,8 @@ AC_CHECK_FUNCS([ \
])
AC_FUNC_FSEEKO
+AC_CHECK_FUNCS([mkostemp])
+
AC_CHECK_FUNCS([openat fstatat unlinkat], [have_openat=yes], [have_openat=no])
AC_CHECK_FUNCS([ioperm iopl], [have_io=yes])
diff --git a/include/c.h b/include/c.h
index 4a9bf3d..1b880ed 100644
--- a/include/c.h
+++ b/include/c.h
@@ -300,4 +300,18 @@ static inline int usleep(useconds_t usec)
# define SEEK_HOLE 4
#endif
+/*
+ * mkostemp() may be missing with older version of uClibc
+ */
+#ifndef HAVE_MKOSTEMP
+static inline int mkostemp(char *template, int flags)
+{
+ int fd;
+ fd = mkstemp(template);
+ if (flags & O_CLOEXEC && fd >= 0)
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
+ return fd;
+}
+#endif
+
#endif /* UTIL_LINUX_C_H */
--
1.9.0

1
make/system-tools-extra.mk

@ -125,7 +125,6 @@ $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz:
$(D)/util-linux: $(D)/libncurses $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz | $(TARGETPREFIX)
$(UNTAR)/util-linux-$(UTIL-LINUX_VER).tar.xz
cd $(BUILD_TMP)/util-linux-$(UTIL-LINUX_VER) && \
$(PATCH)/util-linux-define-mkostemp-for-older-version-of-uClibc.patch && \
autoreconf -fi && \
$(CONFIGURE) \
--prefix= \

Loading…
Cancel
Save