[PATCH] Add ar.h for systems where it doesn't exist

[Ulf Hermann]

Signed-off-by: Ulf Hermann <ulf.hermann@qt.io>
---
 ChangeLog          |  4 ++++
 configure.ac       |  3 +++
 libgnu/ChangeLog   |  5 +++++
 libgnu/Makefile.am |  9 ++++++++-
 libgnu/ar.in.h     | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 libgnu/ar.in.h

diff --git a/ChangeLog b/ChangeLog
index 71c73e5..a2655c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-05-04  Ulf Hermann  <ulf.hermann@qt.io>
 
+	* configure.ac: Check for ar.h.
+
+2017-05-04  Ulf Hermann  <ulf.hermann@qt.io>
+
 	* configure.ac: Check for sysconf() and GetSystemInfo(). Add a
 	declaration of sysconf to config.h if GetSystemInfo() is available,
 	but not sysconf().
diff --git a/configure.ac b/configure.ac
index 2d3ad04..ba560d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -577,6 +577,9 @@ long sysconf(int name);
 #endif
 ])
 
+AC_CHECK_HEADERS(ar.h)
+AM_CONDITIONAL(HAVE_AR_H, [test "x$ac_cv_header_ar_h" = "xyes"])
+
 dnl Check if we have <linux/bpf.h> for EM_BPF disassembly.
 AC_CHECK_HEADERS(linux/bpf.h)
 AM_CONDITIONAL(HAVE_LINUX_BPF_H, [test "x$ac_cv_header_linux_bpf_h" = "xyes"])
diff --git a/libgnu/ChangeLog b/libgnu/ChangeLog
index aa0e603..3d30ce1 100644
--- a/libgnu/ChangeLog
+++ b/libgnu/ChangeLog
@@ -1,5 +1,10 @@
 2017-05-04  Ulf Hermann  <ulf.hermann@qt.io>
 
+	* Makefile.am: If ar.h is unavailable, use our own version.
+	* ar.in.h: New file.
+
+2017-05-04  Ulf Hermann  <ulf.hermann@qt.io>
+
 	* Makefile.am: If sysconf() is unavailable, but GetSystemInfo() is
 	available, compile the win32 version of sysconf.
 	* sysconf_win32.c: New file.
diff --git a/libgnu/Makefile.am b/libgnu/Makefile.am
index 05a8f61..d7af59a 100644
--- a/libgnu/Makefile.am
+++ b/libgnu/Makefile.am
@@ -35,7 +35,7 @@ noinst_LIBRARIES =
 MOSTLYCLEANFILES =
 MOSTLYCLEANDIRS =
 BUILT_SOURCES =
-EXTRA_DIST = endian.in.h byteswap.in.h sys_mman.win32.h mman_win32.c sysconf_win32.c
+EXTRA_DIST = endian.in.h byteswap.in.h sys_mman.win32.h mman_win32.c sysconf_win32.c ar.in.h
 CLEANFILES =
 SUFFIXES =
 
@@ -53,6 +53,13 @@ BUILT_SOURCES += byteswap.h
 MOSTLYCLEANFILES += byteswap.h
 endif
 
+if !HAVE_AR_H
+ar.h: ar.in.h
+	$(AM_V_GEN)rm -f $@ && cat $< > $@
+BUILT_SOURCES += ar.h
+MOSTLYCLEANFILES += ar.h
+endif
+
 if !HAVE_SYS_MMAN_H
 if USE_WIN32_MMAN
 sys/mman.h: sys_mman.win32.h
diff --git a/libgnu/ar.in.h b/libgnu/ar.in.h
new file mode 100644
index 0000000..acdae2f
--- /dev/null
+++ b/libgnu/ar.in.h
@@ -0,0 +1,59 @@
+/* Header describing `ar' archive file format.
+   Copyright (C) 1996-2017 Free Software Foundation, Inc.
+   This file is part of elfutils.
+
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of either
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version
+
+   or both in parallel, as here.
+
+   elfutils is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _AR_H
+#define _AR_H 1
+
+/* Archive files start with the ARMAG identifying string.  Then follows a
+   `struct ar_hdr', and as many bytes of member file data as its `ar_size'
+   member indicates, for each member file.  */
+
+#define ARMAG   "!<arch>\n" /* String that begins an archive file.  */
+#define SARMAG  8           /* Size of that string.  */
+
+#define ARFMAG  "`\n"       /* String in ar_fmag at end of each header.  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct ar_hdr
+{
+    char ar_name[16];          /* Member file name, sometimes / terminated. */
+    char ar_date[12];          /* File date, decimal seconds since Epoch.  */
+    char ar_uid[6], ar_gid[6]; /* User and group IDs, in ASCII decimal.  */
+    char ar_mode[8];           /* File mode, in ASCII octal.  */
+    char ar_size[10];          /* File size, in ASCII decimal.  */
+    char ar_fmag[2];           /* Always contains ARFMAG.  */
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ar.h */
-- 
2.1.4