From 7b362e6dae1d0744b1f35a930e8ec515b1ccb00b Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Thu, 5 Sep 2019 11:11:12 +1200
Subject: Add glibc 2.30

Add the GNU C Library version 2.30. Bring forward the
typedef-caddr.patch. Skip the ARC patch for now.

https://sourceware.org/ml/libc-alpha/2019-08/msg00029.html

Signed-off-by: Chris Packham <judge.packham@gmail.com>

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 4138707..48f49fe 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -37,10 +37,12 @@ config GLIBC_DEP_BINUTILS
 
 # Glibc 2.29 requires GCC5+ or, for ppc64le, GCC6.2+. We only support the latest
 # release on GCC6 branch, so just assume it is newer than 6.2
+# Glibc 2.30 uncondtionally requires GCC 6.2+
 config GLIBC_DEP_GCC
     def_bool y
     select GCC_REQUIRE_5_or_later if GLIBC_2_29_or_later
     select GCC_REQUIRE_6_or_later if GLIBC_2_29_or_later && ARCH_POWERPC && ARCH_64 && ARCH_LE
+    select GCC_REQUIRE_6_or_later if GLIBC_2_30_or_later
 
 # Glibc 2.29 requires bison 2.7 or later. All versions in ct-ng satisfy that
 # version requirement.
diff --git a/packages/glibc/2.30/0000-typedef-caddr.patch b/packages/glibc/2.30/0000-typedef-caddr.patch
new file mode 100644
index 0000000..a328da1
--- /dev/null
+++ b/packages/glibc/2.30/0000-typedef-caddr.patch
@@ -0,0 +1,17 @@
+---
+ posix/sys/types.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
+@@ -112,7 +112,10 @@
+ #ifdef	__USE_MISC
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
diff --git a/packages/glibc/2.30/chksum b/packages/glibc/2.30/chksum
new file mode 100644
index 0000000..a0f8b39
--- /dev/null
+++ b/packages/glibc/2.30/chksum
@@ -0,0 +1,12 @@
+md5 glibc-2.30.tar.xz 2b1dbdf27b28620752956c061d62f60c
+sha1 glibc-2.30.tar.xz 4df7e4dbb92b5ced729d972b32e3b8683db4a689
+sha256 glibc-2.30.tar.xz e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
+sha512 glibc-2.30.tar.xz 37483990cd653685873e96c45dd1651b32b441b6d7919a68ebe3bae31a0c3f7ce183fc9b110f0b268b353f80312f18370559a1e7aecea0e5aa755c8f2aef1d6b
+md5 glibc-2.30.tar.bz2 afb5a260b80ce040443cb32cba0dd8c0
+sha1 glibc-2.30.tar.bz2 a71bcb733e1619be3b3de050a7f8de8037344103
+sha256 glibc-2.30.tar.bz2 35d081fc3ad1dd09f59e4dd385e9dd69718688d89d865154ce49b5cb802789f4
+sha512 glibc-2.30.tar.bz2 0cb272ddf5bd305fb083486b601c59447964ec320bad2fd3d993a6d27672d697a343184bb032d40ffff2dd3e8da77acba4d5f4bbbfd0621cd2969ef827c20ca0
+md5 glibc-2.30.tar.gz 2abb37652a956956b744385fcf299b5b
+sha1 glibc-2.30.tar.gz 8ffa677962a4109b842712d1554a0e7bd9da8739
+sha256 glibc-2.30.tar.gz decb0a29f1410735bed0e8e7247361da2bbf0dcfef7ac15bf26e7f910cb964c0
+sha512 glibc-2.30.tar.gz 18cd09f1e92fa9d73fde75aeb0946f4dc19770d8ffae04ba3fa9af78252ae07acd9fb2d43fc36de8daa20decce98d05579d9d6eb91ff86babf1d41a4ad46a152
diff --git a/packages/glibc/2.30/version.desc b/packages/glibc/2.30/version.desc
new file mode 100644
index 0000000..441e8e6
--- /dev/null
+++ b/packages/glibc/2.30/version.desc
@@ -0,0 +1 @@
+# Released 1 August 2019
diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc
index bc49fe0..03a01b3 100644
--- a/packages/glibc/package.desc
+++ b/packages/glibc/package.desc
@@ -3,6 +3,6 @@ repository='git git://sourceware.org/git/glibc.git'
 mirrors='$(CT_Mirrors GNU glibc)'
 # Cannot use MAJOR.MINOR as the releant part because of 2.12: 2.12.2 was the most recent
 # bugfix release, but it didn't have glibc-ports released alongside it.
-milestones='2.14 2.17 2.20 2.23 2.24 2.25 2.26 2.27 2.29'
+milestones='2.14 2.17 2.20 2.23 2.24 2.25 2.26 2.27 2.29 2.30'
 archive_formats='.tar.xz .tar.bz2 .tar.gz'
 signature_format='packed/.sig'
-- 
cgit v0.10.2-6-g49f6