summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRubin Simons2024-08-16 15:49:59 +0200
committerRubin Simons2024-08-16 15:49:59 +0200
commit9c518e211a984281cda67bd959cab74021c76e70 (patch)
tree3a2fada766d2c8e2896a49eb8a601ab50e4bf43c
parent206784c8771f59ab7cf60cace14b316f9ce84d87 (diff)
downloadaur-9c518e211a984281cda67bd959cab74021c76e70.tar.gz
Removed CLANGD_FLAGS setting, as it is messy when other compilers are involved. Renamed source script.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--marsdev.sh6
3 files changed, 5 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3eae04bdf2f1..a5cc9715f5f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = marsdev-git
pkgdesc = Cross-platform Sega Mega Drive / Super 32X / Sharp X68000 toolchain
pkgver = r153.d4d51e1
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/andwn/marsdev
arch = x86_64
license = MIT
@@ -19,8 +19,6 @@ pkgbase = marsdev-git
options = !debug
options = !lto
source = git+https://github.com/andwn/marsdev
- source = marsdev.sh
sha256sums = SKIP
- sha256sums = cecabf6171a6d102320cd213e9cb9128f41c215f73385828067a135ecdeddbe7
pkgname = marsdev-git
diff --git a/PKGBUILD b/PKGBUILD
index 57fa51960160..d48cda6cf913 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=marsdev
pkgname=${_pkgname}-git
pkgver=r153.d4d51e1
-pkgrel=4
+pkgrel=5
pkgdesc="Cross-platform Sega Mega Drive / Super 32X / Sharp X68000 toolchain"
arch=('x86_64')
url="https://github.com/andwn/${_pkgname}"
@@ -11,8 +11,8 @@ makedepends=('boost' 'texinfo' 'wget' 'java-environment>=11')
depends=('java-environment>=11')
provides=('marsdev' 'x68k-tools' 'sik-tools' 'flamewing-tools' 'sgdk')
license=('MIT')
-source=("git+$url" "marsdev.sh")
-sha256sums=('SKIP' 'cecabf6171a6d102320cd213e9cb9128f41c215f73385828067a135ecdeddbe7')
+source=("git+$url")
+sha256sums=('SKIP')
options=('!strip' '!debug' '!lto')
pkgver() {
@@ -51,6 +51,5 @@ package() {
make install
cp -Rpd "${srcdir}/${_pkgname}/examples" "${pkgdir}/opt/marsdev/examples";
sed -i "s|${pkgdir}||g" "${pkgdir}/opt/marsdev/mars.sh"
- mkdir -p "${pkgdir}/etc/profile.d"
- cp "${srcdir}/marsdev.sh" "${pkgdir}/etc/profile.d/marsdev.sh"
+ mv "${pkgdir}/opt/marsdev/mars.sh" "${pkgdir}/opt/marsdev/marsdev.sh"
}
diff --git a/marsdev.sh b/marsdev.sh
deleted file mode 100644
index 111e2c25675b..000000000000
--- a/marsdev.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-if [[ -x /opt/marsdev/m68k-elf/bin/m68k-elf-gcc && -z "$CLANGD_FLAGS" ]]; then
- # See: https://clangd.llvm.org/guides/system-headers#query-driver
- export CLANGD_FLAGS='--query-driver="/opt/marsdev/*-elf/bin/*"'
-fi