From 66ad1ff51411c24bfad7c1892f7481a9cdc924f8 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 28 Jan 2018 11:42:24 -0800 Subject: Upgrade to new releases android-ndk, binutils, gcc, linux, mpfr, ncurses, newlib, uclibc-ng MPC vs MPFR dependencies required modifications in auto-generated templates to also provide non-inclusive older-than/newer-than specifications. Also correct MPC URLs, the website seems to have adjusted its directory layout. Currently, newlib 3.0.0 doesn't build for arm-nano-eabi. Signed-off-by: Alexey Neyman --- maintainer/kconfig-versions.template | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'maintainer') diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template index 37461b7d..d5d4cc83 100644 --- a/maintainer/kconfig-versions.template +++ b/maintainer/kconfig-versions.template @@ -190,7 +190,9 @@ config @@fork|@@_VERY_NEW depends on @@fork|@@_SRC_DEVEL || @@fork|@@_SRC_CUSTOM #!foreach milestone select @@master|@@_@@ms|@@_or_later + select @@master|@@_later_than_@@ms|@@ depends on !@@master|@@_REQUIRE_@@ms|@@_or_older + depends on !@@master|@@_REQUIRE_older_than_@@ms|@@ #!end-foreach #!foreach version @@ -203,17 +205,21 @@ config @@fork|@@_V_@@ver_sel|@@ depends on EXPERIMENTAL #!end-if #!foreach milestone +#!if [ "@@version_cmp_milestone@@" -gt 0 ] + depends on !@@master|@@_REQUIRE_@@ms|@@_or_older + select @@master|@@_later_than_@@ms|@@ +#!end-if #!if [ "@@version_cmp_milestone@@" -ge 0 ] + depends on !@@master|@@_REQUIRE_older_than_@@ms|@@ select @@master|@@_@@ms|@@_or_later #!end-if #!if [ "@@version_cmp_milestone@@" -le 0 ] + depends on !@@master|@@_REQUIRE_later_than_@@ms|@@ select @@master|@@_@@ms|@@_or_older #!end-if -#!if [ "@@version_cmp_milestone@@" -gt 0 ] - depends on !@@master|@@_REQUIRE_@@ms|@@_or_older -#!end-if #!if [ "@@version_cmp_milestone@@" -lt 0 ] depends on !@@master|@@_REQUIRE_@@ms|@@_or_later + select @@master|@@_older_than_@@ms|@@ #!end-if #!end-foreach @@ -223,7 +229,10 @@ config @@fork|@@_VERY_OLD depends on OBSOLETE && EXPERIMENTAL depends on @@fork|@@_SRC_DEVEL || @@fork|@@_SRC_CUSTOM #!foreach milestone + select @@master|@@_@@ms|@@_or_older + select @@master|@@_older_than_@@ms|@@ depends on !@@master|@@_REQUIRE_@@ms|@@_or_later + depends on !@@master|@@_REQUIRE_later_than_@@ms|@@ #!end-foreach endchoice @@ -293,18 +302,30 @@ endif #!foreach milestone #!// Milestones selected by a chosen version of this package +config @@master|@@_later_than_@@ms|@@ + bool + config @@master|@@_@@ms|@@_or_later bool config @@master|@@_@@ms|@@_or_older bool +config @@master|@@_older_than_@@ms|@@ + bool + #!// Milestone requirements selected by other packages that restrict #!// the choices in this package +config @@master|@@_REQUIRE_later_than_@@ms|@@ + bool + config @@master|@@_REQUIRE_@@ms|@@_or_later bool config @@master|@@_REQUIRE_@@ms|@@_or_older bool +config @@master|@@_REQUIRE_older_than_@@ms|@@ + bool + #!end-foreach -- cgit v1.2.3