diff options
| -rw-r--r-- | my_basic-git/.SRCINFO | 4 | ||||
| -rw-r--r-- | my_basic-git/PKGBUILD | 8 | ||||
| -rw-r--r-- | my_basic-git/my_basic-makefile.patch | 44 |
3 files changed, 35 insertions, 21 deletions
diff --git a/my_basic-git/.SRCINFO b/my_basic-git/.SRCINFO index a0e279f..4b43515 100644 --- a/my_basic-git/.SRCINFO +++ b/my_basic-git/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = my_basic-git pkgdesc = BASIC interpreter - pkgver = r1057.g789019f + pkgver = r1079.gc760bef pkgrel = 1 url = https://paladin-t.github.io/my_basic arch = i686 @@ -9,6 +9,6 @@ pkgbase = my_basic-git source = my_basic-git::git+https://github.com/paladin-t/my_basic source = my_basic-makefile.patch sha256sums = SKIP - sha256sums = 3ef06138e5403c16260897dcb7522cb3caea4ca182d65e0a1acf50693a6a8cf5 + sha256sums = d181f05c86488bb6a77e82b7c18768b9215c3e022d735283a90c85d43438c916 pkgname = my_basic-git diff --git a/my_basic-git/PKGBUILD b/my_basic-git/PKGBUILD index d37cfaa..449c6a4 100644 --- a/my_basic-git/PKGBUILD +++ b/my_basic-git/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=my_basic pkgname=$_pkgname-git -pkgver=r1057.g789019f +pkgver=r1079.gc760bef pkgrel=1 pkgdesc="BASIC interpreter" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('MIT') source=("$pkgname::git+https://github.com/paladin-t/$_pkgname" "$_pkgname-makefile.patch") sha256sums=('SKIP' - '3ef06138e5403c16260897dcb7522cb3caea4ca182d65e0a1acf50693a6a8cf5') + 'd181f05c86488bb6a77e82b7c18768b9215c3e022d735283a90c85d43438c916') pkgver() { cd "${pkgname}" @@ -37,11 +37,11 @@ build() { package() { cd "${pkgname}" - install -Dm755 output/my_basic_bin "${pkgdir}/usr/bin/${_pkgname}" + install -Dm755 output/my_basic "${pkgdir}/usr/bin/${_pkgname}" install -dm755 "${pkgdir}/usr/share/doc/${_pkgname}/sample/yard" - install -m644 HISTORY *.{pdf,html} \ + install -m644 README.md HISTORY *.{pdf,html} \ "${pkgdir}/usr/share/doc/${_pkgname}" install -m644 sample/{README*,*.bas} \ "${pkgdir}/usr/share/doc/${_pkgname}/sample" diff --git a/my_basic-git/my_basic-makefile.patch b/my_basic-git/my_basic-makefile.patch index 2350775..0597b0b 100644 --- a/my_basic-git/my_basic-makefile.patch +++ b/my_basic-git/my_basic-makefile.patch @@ -1,22 +1,36 @@ -diff -u -r -N my_basic/makefile my_basic-makefile/makefile ---- my_basic/makefile 2018-08-28 20:17:25.725132293 +0200 -+++ my_basic-makefile/makefile 2018-08-28 20:32:42.807023449 +0200 +diff '--color=auto' -u -r -N my_basic-git/makefile my_basic-git-makefile/makefile +--- my_basic-git/makefile 2022-08-25 17:22:17.043773022 +0200 ++++ my_basic-git-makefile/makefile 2022-08-25 17:25:35.292744445 +0200 @@ -1,3 +1,5 @@ -+CFLAGS=-Os
-+
++CFLAGS=-Os ++ OS := $(shell uname -s)
IS_APPLE := $(shell echo $(OS)|grep -i darwin)
-@@ -10,10 +12,10 @@ - endif
-
- main.o : shell/main.c core/my_basic.h
-- cc -Os -c shell/main.c -Wno-unused-result
-+ cc $(CFLAGS) -c shell/main.c -Wno-unused-result
-
- my_basic.o : core/my_basic.c core/my_basic.h
+@@ -9,20 +11,20 @@ + my_basic_arm_app.o: my_basic_arm.o main_arm.o + cc -o my_basic_arm_app.o my_basic_arm.o main_arm.o -target arm64-apple-macos11
+ my_basic_x86.o: core/my_basic.c core/my_basic.h
+- cc -Os -c core/my_basic.c -Wno-multichar -Wno-overflow -Wno-unused-result -o my_basic_x86.o -target x86_64-apple-macos10.12
++ cc $(CFLAGS) -c core/my_basic.c -Wno-multichar -Wno-overflow -Wno-unused-result -o my_basic_x86.o -target x86_64-apple-macos10.12
+ main_x86.o: shell/main.c core/my_basic.h
+- cc -Os -c shell/main.c -Wno-unused-result -o main_x86.o -target x86_64-apple-macos10.12
++ cc $(CFLAGS) -c shell/main.c -Wno-unused-result -o main_x86.o -target x86_64-apple-macos10.12
+ my_basic_arm.o: core/my_basic.c core/my_basic.h
+- cc -Os -c core/my_basic.c -Wno-multichar -Wno-overflow -Wno-unused-result -o my_basic_arm.o -target arm64-apple-macos11
++ cc $(CFLAGS) -c core/my_basic.c -Wno-multichar -Wno-overflow -Wno-unused-result -o my_basic_arm.o -target arm64-apple-macos11
+ main_arm.o: shell/main.c core/my_basic.h
+- cc -Os -c shell/main.c -Wno-unused-result -o main_arm.o -target arm64-apple-macos11
++ cc $(CFLAGS) -c shell/main.c -Wno-unused-result -o main_arm.o -target arm64-apple-macos11
+ else
+ my_basic: my_basic.o main.o
+ cc -o output/my_basic my_basic.o main.o -lm -lrt
+ my_basic.o: core/my_basic.c core/my_basic.h
- cc -Os -c core/my_basic.c -Wno-multichar -Wno-overflow -Wno-unused-result
+ cc $(CFLAGS) -c core/my_basic.c -Wno-multichar -Wno-overflow -Wno-unused-result
+ main.o: shell/main.c core/my_basic.h
+- cc -Os -c shell/main.c -Wno-unused-result
++ cc $(CFLAGS) -c shell/main.c -Wno-unused-result
+ endif
- clean :
- rm -f main.o my_basic.o output/my_basic_bin output/my_basic_bin.exe
+ clean:
|