Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

linux-samsung-dream: ignore bundled toolchain

Browse source 
To fix errors like:

../toolchain/gcc-cfp/gcc-cfp-jopp-only/aarch64-linux-android-4.9/bin/aarch64-linux-android-ld: line 1: syntax error: unexpected "("
make[3]: *** [../scripts/Makefile.build:345: kernel/bpf/built-in.o] Error 2
make[2]: *** [../scripts/Makefile.build:411: kernel/bpf] Error 2

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6706
This commit is contained in:
Henrik Grimler 2025-06-27 11:49:35 +02:00 • committed by Clayton Craft
parent ee1363afa8
commit a0d79b92e1
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
device/downstream/linux-samsung-dream/0006-Makefile-ignore-bundled-toolchain.patch Normal file
View file

@ -0,0 +1,26 @@
From aedfcba925841807c0d401eb55ffbdd9d57ef16b Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Fri, 27 Jun 2025 11:17:12 +0200
Subject: [PATCH] Makefile: ignore bundled toolchain
Use the gcc from the system instead.
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 7bece7a1f052..27ed5fea30b1 100755
--- a/Makefile
+++ b/Makefile
@@ -256,7 +256,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
#CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
ARCH ?= arm64
#CROSS_COMPILE ?= ../PLATFORM/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-
-CROSS_COMPILE ?= $(srctree)/toolchain/gcc-cfp/gcc-cfp-jopp-only/aarch64-linux-android-4.9/bin/aarch64-linux-android-
+# CROSS_COMPILE ?= $(srctree)/toolchain/gcc-cfp/gcc-cfp-jopp-only/aarch64-linux-android-4.9/bin/aarch64-linux-android-
# Architecture as present in compile.h
UTS_MACHINE := $(ARCH)
--
2.50.0

2
device/downstream/linux-samsung-dream/APKBUILD
View file

@ -29,6 +29,7 @@ source="
0003-Change-dtb-config-variable.patch
0004-Fix-wireless-firmware-path.patch
0005-Fix-display-colors-use-RGB-instead-of-BGR.patch
0006-Makefile-ignore-bundled-toolchain.patch
linux4.2-gcc10-extern_YYLOC_global_declaration.patch
fix-check-lxdialog.patch
"
@ -86,6 +87,7 @@ bc035012f50c5f4736f54c15d1c46822ab5c99d055cc6428dd80c523bd308b4477a47c7afd5627cb
79e3b877ed125b1aa4dda684af44f2dccd52e4025908323c2b4c14484e5aab5dd4956a7d1ca7096bfc1d7427a25a2e18f5b07bcaebbf8f9e07433f918b0c4a36 0003-Change-dtb-config-variable.patch
41a91d28c55243e6cbc2b56a7ec2c8e62f51f2ee5b889cd0629eb886d9b5b71fc1b7a2f9cca643026ae564c91f449e22ded53a6b3c361d02a27c4b4f7e8e9fe3 0004-Fix-wireless-firmware-path.patch
b4b209f3de5de68377a2f7e518c0279c11972bc6b1369f09408acdfa9859206283bab8fe548626bc0fdd364e6adcb7eb197575fb711f805a03dad27c6c10c6fc 0005-Fix-display-colors-use-RGB-instead-of-BGR.patch
60e8184c006f633c7cf459576fff6b5fe1b20831160a664cf3e6f2faaec7e7a11c01781d89a3eef9c482ff9629503661213cae4d38c527f74890bb5c2b9c2f36 0006-Makefile-ignore-bundled-toolchain.patch
eaf2e61fcb508cdd239b8fed209d2a09ecac77287f6b46d003918fdf1c6fa2ee63f7390f3ff7c49029b8ed6cbcdd81c7e9a4b1ece9f5060b6fc84e322bd47f41 linux4.2-gcc10-extern_YYLOC_global_declaration.patch
182be3c596b9cc267ac108d7cf03fc8c328ccc6b36770800e4dcedea8d1bb65e3f5eacf590c2948f58b1418cc60a1670ba77dde8c259e428d158c31b6e1dbaf5 fix-check-lxdialog.patch
"