summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiab Neiroukh2020-04-28 14:25:04 +0100
committerDiab Neiroukh2020-04-28 14:25:04 +0100
commitee24b58313612aef177d6eec13f61f4642b8e9a6 (patch)
tree3110b8f01e3969ac92824647ec69b076208ccf68
parent21b634a5766dec319bb92b8dbff3f8b9637fb983 (diff)
downloadaur-ee24b58313612aef177d6eec13f61f4642b8e9a6.tar.gz
🐛 FIX: Correct tools used in the headers Makefile
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9219b79df68..90e3a1a5b49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-zest-git
pkgver = 5.6
pkgrel = 1
- epoch = 1
+ epoch = 3
url = https://github.com/ZestProjects/linux
arch = i686
arch = x86_64
@@ -13,7 +13,6 @@ pkgbase = linux-zest-git
makedepends = inetutils
makedepends = kmod
makedepends = libelf
- makedepends = llvm-proton-bin
makedepends = python-sphinx
makedepends = python-sphinx_rtd_theme
makedepends = xmlto
@@ -26,6 +25,7 @@ pkgname = linux-zest-git
depends = coreutils
depends = initramfs
depends = kmod
+ depends = llvm-proton-bin
optdepends = crda: to set the correct wireless channels of your country
optdepends = linux-firmware: firmware images needed for some devices
provides = linux
diff --git a/PKGBUILD b/PKGBUILD
index e851fef98e6..c4c539923cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=(
)
pkgver=5.6
pkgrel=1
-epoch=1
+epoch=3
arch=(
"i686"
"x86_64"
@@ -122,13 +122,13 @@ _package-headers()
echo "Installing build files..."
install -Dt "$builddir" -m644 ".config" "Makefile" "Module.symvers" "System.map" "version" "vmlinux"
- #*
+ #* Replace default tools in the headers Makefile with the ones we use
sed -i "s/HOSTCC = gcc/HOSTCC = \/opt\/proton-clang\/bin\/clang/g" "$builddir/Makefile"
sed -i "s/HOSTCXX = g++/HOSTCXX = \/opt\/proton-clang\/bin\/clang++\nHOSTLD = \/opt\/proton-clang\/bin\/ld.lld/g" "$builddir/Makefile"
sed -i "s/CC\t\t= \$(CROSS_COMPILE)gcc/CC\t\t= \/opt\/proton-clang\/bin\/clang/g" "$builddir/Makefile"
sed -i "s/LD\t\t= \$(CROSS_COMPILE)ld/LD\t\t= \/opt\/proton-clang\/bin\/ld.lld/g" "$builddir/Makefile"
- sed -i "s/NM\t\t= \$(CROSS_COMPILE)nm/LD\t\t= \/opt\/proton-clang\/bin\/llvm-nm/g" "$builddir/Makefile"
- sed -i "s/OBJCOPY\t\t= \$(CROSS_COMPILE)objcopy/LD\t\t= \/opt\/proton-clang\/bin\/llvm-objcopy/g" "$builddir/Makefile"
+ sed -i "s/NM\t\t= \$(CROSS_COMPILE)nm/NM\t\t= \/opt\/proton-clang\/bin\/llvm-nm/g" "$builddir/Makefile"
+ sed -i "s/OBJCOPY\t\t= \$(CROSS_COMPILE)objcopy/OBJCOPY\t\t= \/opt\/proton-clang\/bin\/llvm-objcopy/g" "$builddir/Makefile"
install -Dt "$builddir/kernel" -m644 "kernel/Makefile"
install -Dt "$builddir/arch/x86" -m644 "arch/x86/Makefile"