From 0fe21f8db8c720a65da62880c0eacb32e37ba55f Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 30 Jan 2019 00:09:30 -0800
Subject: Config v2: select relevant parts of each package version

Also, remove a couple of config options that dealt with package versions
that have been since retired.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 74fbb70..f52a07b 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -34,11 +34,6 @@ config CC_GCC_ENABLE_PLUGINS
     depends on BINUTILS_PLUGINS
     depends on ! STATIC_TOOLCHAIN
 
-# Affects the build of musl
-config GCC_BUG_61144
-    bool
-    default y if GCC_4_9_or_later && !GCC_4_9_2_or_later
-
 # If binutils installs gold, enable support for gold in gcc
 config CC_GCC_GOLD
     def_bool y
diff --git a/config/comp_libs/cloog.in b/config/comp_libs/cloog.in
index 54cb76b..01318b4 100644
--- a/config/comp_libs/cloog.in
+++ b/config/comp_libs/cloog.in
@@ -1,8 +1 @@
 # CLooG options
-
-# CLooG 0.18.4 requires ISL 0.12 or newer
-# CLooG 0.18.1/0.18.0 requires ISL 0.12 or older
-
-config CLOOG_HAS_WITH_GMP_ISL_OSL
-	bool
-	default y if CLOOG_0_18_or_later
diff --git a/config/comp_libs/isl.in b/config/comp_libs/isl.in
index e0358ee..fe6fa8d 100644
--- a/config/comp_libs/isl.in
+++ b/config/comp_libs/isl.in
@@ -1,4 +1,6 @@
 # ISL options
+# CLooG 0.18.4 requires ISL 0.12 or newer
+# CLooG 0.18.1 requires ISL 0.12 or older
 ## select CLOOG_REQUIRE_0_18_1_or_older if CLOOG_NEEDED && !ISL_0_12_or_later
 ## select CLOOG_REQUIRE_0_18_4_or_later if CLOOG_NEEDED && !ISL_0_14_or_older
 
diff --git a/ct-ng.in b/ct-ng.in
index 6f08032..0120d35 100644
--- a/ct-ng.in
+++ b/ct-ng.in
@@ -41,7 +41,7 @@ export CT_VCHECK=
 # need to pass it to the upgrade script - which may receive an input that
 # was not preprocessed by kconfig, and hence have no string for "up-to-date"
 # version.
-export CT_CONFIG_VERSION_CURRENT=1
+export CT_CONFIG_VERSION_CURRENT=2
 
 # Download agents used by scripts.mk
 CT_WGET     := @wget@
diff --git a/packages/android-ndk/package.desc b/packages/android-ndk/package.desc
index 5be8222..8811b3c 100644
--- a/packages/android-ndk/package.desc
+++ b/packages/android-ndk/package.desc
@@ -1,4 +1,5 @@
 # We don't support building bionic (yet) so no official repository
 mirrors='https://dl.google.com/android/repository'
+relevantpattern='r*|[a-z]'
 archive_filename='@{pkg_name}-@{version}-linux-x86_64'
 archive_formats='.zip'
diff --git a/packages/automake/package.desc b/packages/automake/package.desc
index c199893..7e531e6 100644
--- a/packages/automake/package.desc
+++ b/packages/automake/package.desc
@@ -1,5 +1,6 @@
 repository='git https://git.savannah.gnu.org/git/automake.git'
 bootstrap='./bootstrap'
 mirrors='$(CT_Mirrors GNU automake)'
+relevantpattern='1.*|.'
 archive_formats='.tar.xz .tar.gz'
 signature_format='packed/.sig'
diff --git a/packages/binutils/package.desc b/packages/binutils/package.desc
index 317cd6c..d5c9b22 100644
--- a/packages/binutils/package.desc
+++ b/packages/binutils/package.desc
@@ -1,5 +1,6 @@
 repository='git git://sourceware.org/git/binutils-gdb.git'
 mirrors='$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)'
+relevantpattern='*.*|.'
 origin='GNU'
 milestones='2.23 2.25 2.27 2.30'
 archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/cloog/package.desc b/packages/cloog/package.desc
index 2a12994..7f01ea9 100644
--- a/packages/cloog/package.desc
+++ b/packages/cloog/package.desc
@@ -1,5 +1,5 @@
 pkg_label='CLooG'
 repository='git git://repo.or.cz/cloog.git'
 mirrors='http://www.bastoul.net/cloog/pages/download ftp://gcc.gnu.org/pub/gcc/infrastructure'
-milestones='0.18 0.18.1 0.18.4'
+milestones='0.18.1 0.18.4'
 archive_formats='.tar.gz'
diff --git a/packages/dtc/package.desc b/packages/dtc/package.desc
index 97d6da8..5f65d22 100644
--- a/packages/dtc/package.desc
+++ b/packages/dtc/package.desc
@@ -1,4 +1,5 @@
 repository='git git://git.kernel.org/pub/scm/utils/dtc/dtc.git'
 mirrors='$(CT_Mirrors kernel.org dtc)'
+relevantpattern='*.*|.'
 archive_formats='.tar.xz .tar.gz'
 signature_format='unpacked/.sign'
diff --git a/packages/expat/package.desc b/packages/expat/package.desc
index 6a541b3..4e3e1a0 100644
--- a/packages/expat/package.desc
+++ b/packages/expat/package.desc
@@ -3,3 +3,4 @@ repository_subdir='expat'
 bootstrap='./buildconf.sh && make -C doc all'
 mirrors='http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}'
 archive_formats='.tar.bz2'
+relevantpattern='*.*|.'
diff --git a/packages/gcc-linaro/package.desc b/packages/gcc-linaro/package.desc
index fd475c1..814260b 100644
--- a/packages/gcc-linaro/package.desc
+++ b/packages/gcc-linaro/package.desc
@@ -1,6 +1,7 @@
 master='gcc'
 repository='git https://git.linaro.org/toolchain/gcc.git'
 mirrors='$(CT_Mirrors Linaro gcc ${CT_GCC_LINARO_VERSION})'
+relevantpattern='4.*|- *|.'
 origin='Linaro'
 experimental='yes'
 archive_formats='.tar.xz'
diff --git a/packages/gcc/package.desc b/packages/gcc/package.desc
index 0bfc71b..e6d98f8 100644
--- a/packages/gcc/package.desc
+++ b/packages/gcc/package.desc
@@ -1,5 +1,6 @@
 repository='svn svn://gcc.gnu.org/svn/gcc'
 mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})'
+relevantpattern='4.*|. *|.'
 origin='GNU'
-milestones='4.8 4.9 4.9.2 5 6 7'
+milestones='4.8 4.9 5 6 7'
 archive_formats='.tar.xz .tar.gz'
diff --git a/packages/gdb-linaro/7.7-2014.05/chksum b/packages/gdb-linaro/7.7-2014.05/chksum
deleted file mode 100644
index 99f13ab..0000000
--- a/packages/gdb-linaro/7.7-2014.05/chksum
+++ /dev/null
@@ -1,4 +0,0 @@
-md5 gdb-linaro-7.7-2014.05.tar.bz2 af99ab893b970d8e36c6c0f62887e93e
-sha1 gdb-linaro-7.7-2014.05.tar.bz2 5afccf133d08d7b389e2b58f44a4a854b407b5ba
-sha256 gdb-linaro-7.7-2014.05.tar.bz2 b3d91cc1a0325a75cd5952bade5f1f8b1352c369b89f35b63300384dac69b383
-sha512 gdb-linaro-7.7-2014.05.tar.bz2 b4fa1cd607eda2cdfd568a4aeb8498a14a8b654ef49e9ab7aab08bcf630d90201660a19a1d4fac473d9c1806b0c76a59d5d5d3c4b451ead394f775c9698939fd
diff --git a/packages/gdb-linaro/7.7-2014.05/version.desc b/packages/gdb-linaro/7.7-2014.05/version.desc
deleted file mode 100644
index a114052..0000000
--- a/packages/gdb-linaro/7.7-2014.05/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2'
diff --git a/packages/gdb-linaro/package.desc b/packages/gdb-linaro/package.desc
index bc11a17..ad4ffb5 100644
--- a/packages/gdb-linaro/package.desc
+++ b/packages/gdb-linaro/package.desc
@@ -1,6 +1,7 @@
 master='gdb'
 repository='git https://git.linaro.org/toolchain/binutils-gdb.git'
 mirrors='$(CT_Mirrors Linaro gdb ${CT_GDB_LINARO_VERSION})'
+relevantpattern='*.*|.*-20[0-9][0-9] *.*|-20[0-9][0-9]'
 origin='Linaro'
 experimental='yes'
 archive_formats='.tar.xz'
diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc
index b432cf9..3ac65f8 100644
--- a/packages/gdb/package.desc
+++ b/packages/gdb/package.desc
@@ -1,5 +1,6 @@
 origin='GNU'
 repository='git git://sourceware.org/git/binutils-gdb.git'
 mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)'
+relevantpattern='*.*|[a-z.]'
 milestones='7.0 7.2 7.12 8.0'
 archive_formats='.tar.xz .tar.gz'
diff --git a/packages/glibc-linaro/package.desc b/packages/glibc-linaro/package.desc
index 7c455d4..ddf465a 100644
--- a/packages/glibc-linaro/package.desc
+++ b/packages/glibc-linaro/package.desc
@@ -1,6 +1,7 @@
 master='glibc'
 origin='Linaro'
 repository='git https://git.linaro.org/toolchain/glibc.git'
+relevantpattern='*|-'
 mirrors='$(CT_Mirrors Linaro glibc ${CT_GLIBC_LINARO_VERSION})'
 experimental='yes'
 archive_formats='.tar.xz'
diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc
index 0d256c9..64e1409 100644
--- a/packages/glibc/package.desc
+++ b/packages/glibc/package.desc
@@ -1,6 +1,8 @@
 origin='GNU'
 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'
 archive_formats='.tar.xz .tar.bz2 .tar.gz'
 signature_format='packed/.sig'
diff --git a/packages/gmp/package.desc b/packages/gmp/package.desc
index 3bf7dc5..5936eea 100644
--- a/packages/gmp/package.desc
+++ b/packages/gmp/package.desc
@@ -1,6 +1,7 @@
 repository='hg https://gmplib.org/repo/gmp/'
 bootstrap='./.bootstrap'
 mirrors='https://gmplib.org/download/gmp https://gmplib.org/download/gmp/archive $(CT_Mirrors GNU gmp)'
+relevantpattern='*.*|.'
 milestones='5.0.0 5.1.0'
 archive_formats='.tar.xz .tar.lz .tar.bz2'
 signature_format='packed/.sig'
diff --git a/packages/isl/package.desc b/packages/isl/package.desc
index 3e1e9ca..ffae478 100644
--- a/packages/isl/package.desc
+++ b/packages/isl/package.desc
@@ -1,5 +1,6 @@
 repository='git git://repo.or.cz/isl.git'
 bootstrap='./autogen.sh'
 mirrors='http://isl.gforge.inria.fr'
+relevantpattern='*.*|.'
 milestones='0.12 0.13 0.14 0.15 0.18'
 archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/libelf/package.desc b/packages/libelf/package.desc
index e809220..9f65820 100644
--- a/packages/libelf/package.desc
+++ b/packages/libelf/package.desc
@@ -1,4 +1,5 @@
 # FIXME No public repository and no new releases.
 # Consider switching to/adding project elftoolchain?
 mirrors='http://www.mr511.de/software'
+relevantpattern='*.*|.'
 archive_formats='.tar.gz'
diff --git a/packages/libtool/package.desc b/packages/libtool/package.desc
index 6c9d38d..ff4127a 100644
--- a/packages/libtool/package.desc
+++ b/packages/libtool/package.desc
@@ -1,5 +1,6 @@
 repository='git git://git.savannah.gnu.org/libtool.git'
 bootstrap='./bootstrap'
 mirrors='$(CT_Mirrors GNU libtool)'
+relevantpattern='*.*|.'
 archive_formats='.tar.xz .tar.gz'
 signature_format='packed/.sig'
diff --git a/packages/m4/package.desc b/packages/m4/package.desc
index 611f28e..73def83 100644
--- a/packages/m4/package.desc
+++ b/packages/m4/package.desc
@@ -1,5 +1,6 @@
 repository='git git://git.sv.gnu.org/m4'
 bootstrap='./bootstrap'
 mirrors='$(CT_Mirrors GNU m4)'
+relevantpattern='*.*|.'
 archive_formats='.tar.xz .tar.bz2 .tar.gz'
 signature_format='packed/.sig'
diff --git a/packages/make/package.desc b/packages/make/package.desc
index fa678aa..b72af79 100644
--- a/packages/make/package.desc
+++ b/packages/make/package.desc
@@ -1,5 +1,6 @@
 repository='git https://git.savannah.gnu.org/git/make.git'
 bootstrap='autoreconf -i'
 mirrors='$(CT_Mirrors GNU make)'
+relevantpattern='*.*|.'
 archive_formats='.tar.bz2 .tar.gz'
 signature_format='packed/.sig'
diff --git a/packages/mingw-w64/package.desc b/packages/mingw-w64/package.desc
index ff2f315..d2f7e6d 100644
--- a/packages/mingw-w64/package.desc
+++ b/packages/mingw-w64/package.desc
@@ -1,5 +1,6 @@
 repository='git https://git.code.sf.net/p/mingw-w64/mingw-w64'
 mirrors='http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/'
+relevantpattern='v*.*|.'
 milestones='v4'
 archive_formats='.tar.bz2 .zip'
 signature_format='packed/.sig'
diff --git a/packages/mpc/package.desc b/packages/mpc/package.desc
index 028869e..b834d37 100644
--- a/packages/mpc/package.desc
+++ b/packages/mpc/package.desc
@@ -1,6 +1,7 @@
 repository='git https://scm.gforge.inria.fr/anonscm/git/mpc/mpc.git'
 bootstrap='autoreconf -i'
 mirrors='http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)'
+relevantpattern='*.*|.'
 archive_formats='.tar.gz'
 signature_format='packed/.sig'
 milestones='1.1.0'
diff --git a/packages/mpfr/package.desc b/packages/mpfr/package.desc
index aaddc7d..43b8a36 100644
--- a/packages/mpfr/package.desc
+++ b/packages/mpfr/package.desc
@@ -2,6 +2,7 @@ repository='svn https://scm.gforge.inria.fr/anonscm/svn/mpfr'
 # TBD: meta-package autoconf-archive to install extra m4's
 bootstrap='wget -O m4/ax_pthread.m4 \\"http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_pthread.m4\\" && ./autogen.sh'
 mirrors='http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)'
+relevantpattern='*.*|.'
 archive_formats='.tar.xz .tar.bz2 .tar.gz .zip'
 signature_format='packed/.asc'
 milestones='3.0.0 4.0.0'
diff --git a/packages/newlib-linaro/package.desc b/packages/newlib-linaro/package.desc
index bc92a5b..74d8f17 100644
--- a/packages/newlib-linaro/package.desc
+++ b/packages/newlib-linaro/package.desc
@@ -2,5 +2,6 @@ origin='Linaro'
 master='newlib'
 repository='git https://git.linaro.org/toolchain/newlib.git'
 mirrors='$(CT_Mirrors Linaro newlib ${CT_NEWLIB_LINARO_VERSION})'
+relevantpattern='*.*|.*-'
 experimental='yes'
 archive_formats='.tar.xz'
diff --git a/packages/newlib/package.desc b/packages/newlib/package.desc
index 0d2819b..d9ebb3d 100644
--- a/packages/newlib/package.desc
+++ b/packages/newlib/package.desc
@@ -4,5 +4,5 @@ repository='git git://sourceware.org/git/newlib-cygwin.git'
 # and gnu.org) only store some older releases of newlib (2.0.0 and before).
 mirrors='ftp://sourceware.org/pub/newlib'
 milestones='2.0 2.1 2.2'
-relevantpattern='*.*.*|.'
+relevantpattern='*.*|.*. *.*|.'
 archive_formats='.tar.gz'
diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh
index 445d259..e0f89eb 100644
--- a/scripts/build/companion_libs/130-cloog.sh
+++ b/scripts/build/companion_libs/130-cloog.sh
@@ -79,11 +79,9 @@ do_cloog_backend() {
         eval "${arg// /\\ }"
     done
 
-    if [ "${CT_CLOOG_HAS_WITH_GMP_ISL_OSL}" = y ]; then
-        cloog_opts+=( --with-gmp=system --with-gmp-prefix="${prefix}" )
-        cloog_opts+=( --with-isl=system --with-isl-prefix="${prefix}" )
-        cloog_opts+=( --without-osl )
-    fi
+    cloog_opts+=( --with-gmp=system --with-gmp-prefix="${prefix}" )
+    cloog_opts+=( --with-isl=system --with-isl-prefix="${prefix}" )
+    cloog_opts+=( --without-osl )
 
     CT_DoLog EXTRA "Configuring CLooG"
 
diff --git a/scripts/build/libc/musl.sh b/scripts/build/libc/musl.sh
index 0a93d10..b8ea9b1 100644
--- a/scripts/build/libc/musl.sh
+++ b/scripts/build/libc/musl.sh
@@ -68,13 +68,6 @@ musl_backend_once() {
 
     extra_cflags=( ${multi_flags} )
 
-    # From buildroot:
-    # gcc constant folding bug with weak aliases workaround
-    # See http://www.openwall.com/lists/musl/2014/05/15/1
-    if [ "${CT_GCC_BUG_61144}" = "y" ]; then
-        extra_cflags+=("-fno-toplevel-reorder")
-    fi
-
     if [ "${CT_LIBC_MUSL_DEBUG}" = "y" ]; then
         extra_config+=("--enable-debug")
     fi
-- 
cgit v0.10.2-6-g49f6