From b0f78029cd93870babbf1ba947ffaeb6b825e05c Mon Sep 17 00:00:00 2001 From: timbz Date: Sun, 13 Sep 2020 13:28:44 +0200 Subject: [PATCH] linux-samsung-kylepro: build with gcc 6 (MR 1574) --- device/testing/linux-samsung-kylepro/APKBUILD | 18 +++++++++++------- ...gcc10-extern_YYLOC_global_declaration.patch | 1 + ...-give-up-on-ilog2-const-optimizations.patch | 1 - .../gcc8-fix-put-user.patch | 1 - 4 files changed, 12 insertions(+), 9 deletions(-) create mode 120000 device/testing/linux-samsung-kylepro/gcc10-extern_YYLOC_global_declaration.patch delete mode 120000 device/testing/linux-samsung-kylepro/gcc7-give-up-on-ilog2-const-optimizations.patch delete mode 120000 device/testing/linux-samsung-kylepro/gcc8-fix-put-user.patch diff --git a/device/testing/linux-samsung-kylepro/APKBUILD b/device/testing/linux-samsung-kylepro/APKBUILD index 2e57a8409..8de9b320c 100644 --- a/device/testing/linux-samsung-kylepro/APKBUILD +++ b/device/testing/linux-samsung-kylepro/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-samsung-kylepro pkgver=3.4.113 -pkgrel=4 +pkgrel=5 pkgdesc="Samsung Galaxy Trend Plus kernel fork" arch="armv7" _carch="arm" @@ -11,7 +11,13 @@ _flavor="samsung-kylepro" url="https://kernel.org" license="GPL-2.0-only" options="!strip !check !tracedeps pmb:cross-native" -makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev" +makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev gcc6" + +# Compiler: GCC 6 (doesn't boot when compiled with newer versions than GCC 9) +if [ "${CC:0:5}" != "gcc6-" ]; then + CC="gcc6-$CC" + CROSS_COMPILE="gcc6-$CROSS_COMPILE" +fi # Source _repository="android_kernel_samsung_kyleproxx" @@ -20,10 +26,9 @@ _config="config-$_flavor.$arch" source=" $pkgname-$_commit.tar.gz::https://github.com/Samsung-KYLEPROXX/$_repository/archive/$_commit.tar.gz $_config - gcc7-give-up-on-ilog2-const-optimizations.patch - gcc8-fix-put-user.patch 00_return_address.patch 02_screen_reset.patch + gcc10-extern_YYLOC_global_declaration.patch " builddir="$srcdir/$_repository-$_commit" @@ -44,7 +49,6 @@ package() { sha512sums="b66ab7d8ed557ed095b059beb7b37d196a7290e6c8364560126a94f696718c4a61f99b1e21700d9a4b50c569243e4e2cbfc9fbd9d9517ca49cfa32f31525c27f linux-samsung-kylepro-026cf3b3e97ec40aa1c0c52837a318725786f05a.tar.gz 212a91f3f16b98c8cf5e89841c7ec4d4c1e5ee5733f871da0cfdbc8c9f23953a790061faa4b459e19d5fe7f0a9762777610b71403bea24215fe7e9bb5fb2eb86 config-samsung-kylepro.armv7 -77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch -197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch c40eaa11547f5bc2b1ff965506bdfe3015ff16e4b5ad9ccb3b8134ceafd1d32407c4ef2b213e02e036ce1e9bdcbfe768dff7d4b054bec77705a176c1f783b6f5 00_return_address.patch -c0a59be648ef646650c83b5d135daa05aae300c7ad5056d49f1b3f9967c4d7f337b0ddb8ae319b11e43c17aaf5fc9dcc9724463d265c1d765dc85c86f612f4ea 02_screen_reset.patch" +c0a59be648ef646650c83b5d135daa05aae300c7ad5056d49f1b3f9967c4d7f337b0ddb8ae319b11e43c17aaf5fc9dcc9724463d265c1d765dc85c86f612f4ea 02_screen_reset.patch +2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch" diff --git a/device/testing/linux-samsung-kylepro/gcc10-extern_YYLOC_global_declaration.patch b/device/testing/linux-samsung-kylepro/gcc10-extern_YYLOC_global_declaration.patch new file mode 120000 index 000000000..fe99abf4d --- /dev/null +++ b/device/testing/linux-samsung-kylepro/gcc10-extern_YYLOC_global_declaration.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch \ No newline at end of file diff --git a/device/testing/linux-samsung-kylepro/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/testing/linux-samsung-kylepro/gcc7-give-up-on-ilog2-const-optimizations.patch deleted file mode 120000 index da3d1ed41..000000000 --- a/device/testing/linux-samsung-kylepro/gcc7-give-up-on-ilog2-const-optimizations.patch +++ /dev/null @@ -1 +0,0 @@ -../../.shared-patches/linux/gcc7-give-up-on-ilog2-const-optimizations.patch \ No newline at end of file diff --git a/device/testing/linux-samsung-kylepro/gcc8-fix-put-user.patch b/device/testing/linux-samsung-kylepro/gcc8-fix-put-user.patch deleted file mode 120000 index 1d40b2674..000000000 --- a/device/testing/linux-samsung-kylepro/gcc8-fix-put-user.patch +++ /dev/null @@ -1 +0,0 @@ -../../.shared-patches/linux/gcc8-fix-put-user.patch \ No newline at end of file