diff options
-rw-r--r-- | config/cc/gcc.in | 12 | ||||
-rw-r--r-- | config/kernel/linux.in | 24 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | patches/glibc/2.11/920-make-40.patch | 12 |
4 files changed, 38 insertions, 14 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 4781060..28894b3 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -48,6 +48,11 @@ config CC_GCC_V_linaro_4_9 depends on CC_GCC_SHOW_LINARO select CC_GCC_4_9 +config CC_GCC_V_4_9_3 + bool + prompt "4.9.3" + select CC_GCC_4_9 + config CC_GCC_V_4_9_2 bool prompt "4.9.2" @@ -69,6 +74,11 @@ config CC_GCC_V_linaro_4_8 depends on CC_GCC_SHOW_LINARO select CC_GCC_4_8 +config CC_GCC_V_4_8_5 + bool + prompt "4.8.5" + select CC_GCC_4_8 + config CC_GCC_V_4_8_4 bool prompt "4.8.4" @@ -533,10 +543,12 @@ config CC_GCC_VERSION # CT_INSERT_VERSION_STRING_BELOW default "5.1.0" if CC_GCC_V_5_1_0 default "linaro-4.9-2015.03" if CC_GCC_V_linaro_4_9 + default "4.9.3" if CC_GCC_V_4_9_3 default "4.9.2" if CC_GCC_V_4_9_2 default "4.9.1" if CC_GCC_V_4_9_1 default "4.9.0" if CC_GCC_V_4_9_0 default "linaro-4.8-2015.02" if CC_GCC_V_linaro_4_8 + default "4.8.5" if CC_GCC_V_4_8_5 default "4.8.4" if CC_GCC_V_4_8_4 default "4.8.3" if CC_GCC_V_4_8_3 default "4.8.2" if CC_GCC_V_4_8_2 diff --git a/config/kernel/linux.in b/config/kernel/linux.in index 90afabf..eacc65e 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -27,13 +27,13 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW -config KERNEL_V_4_0 +config KERNEL_V_4_1 bool - prompt "4.0.5 (stable)" + prompt "4.1 (mainline)" -config KERNEL_V_3_19 +config KERNEL_V_4_0 bool - prompt "3.19.8 (EOL)" + prompt "4.0.6 (stable)" config KERNEL_V_3_18 bool @@ -41,7 +41,7 @@ config KERNEL_V_3_18 config KERNEL_V_3_14 bool - prompt "3.14.44" + prompt "3.14.45" config KERNEL_V_3_12 bool @@ -49,11 +49,11 @@ config KERNEL_V_3_12 config KERNEL_V_3_10 bool - prompt "3.10.80" + prompt "3.10.81" config KERNEL_V_3_4 bool - prompt "3.4.107" + prompt "3.4.108" config KERNEL_V_3_2 bool @@ -84,13 +84,13 @@ config KERNEL_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW - default "4.0.5" if KERNEL_V_4_0 - default "3.19.8" if KERNEL_V_3_19 + default "4.1" if KERNEL_V_4_1 + default "4.0.6" if KERNEL_V_4_0 default "3.18.16" if KERNEL_V_3_18 - default "3.14.44" if KERNEL_V_3_14 + default "3.14.45" if KERNEL_V_3_14 default "3.12.44" if KERNEL_V_3_12 - default "3.10.80" if KERNEL_V_3_10 - default "3.4.107" if KERNEL_V_3_4 + default "3.10.81" if KERNEL_V_3_10 + default "3.4.108" if KERNEL_V_3_4 default "3.2.69" if KERNEL_V_3_2 default "2.6.32.67" if KERNEL_V_2_6_32 default "custom" if KERNEL_LINUX_CUSTOM diff --git a/configure.ac b/configure.ac index 573d0b9..adde2ab 100644 --- a/configure.ac +++ b/configure.ac @@ -391,8 +391,8 @@ AS_IF( subdocdir="" datarootdir="$prefix" mandir="$docdir"], - [sublibdir="/ct-ng.\${VERSION}" - subdocdir="/ct-ng.\${VERSION}"]) + [sublibdir="/\${VERSION}" + subdocdir="/\${VERSION}"]) #-------------------------------------------------------------------- # Finally, generate the output file(s) diff --git a/patches/glibc/2.11/920-make-40.patch b/patches/glibc/2.11/920-make-40.patch new file mode 100644 index 0000000..afb7cc4 --- /dev/null +++ b/patches/glibc/2.11/920-make-40.patch @@ -0,0 +1,12 @@ +diff -urN glibc-2.11-orig/configure glibc-2.11/configure +--- glibc-2.11-orig/configure 2015-07-14 08:14:11.671891176 -0700 ++++ glibc-2.11/configure 2015-07-14 09:14:10.053054117 -0700 +@@ -5108,7 +5108,7 @@ + ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 3.79* | 3.[89]*) ++ 3.79* | 3.[89]* | 4.* ) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + |