Date: Tuesday, March 21, 2023 @ 18:20:27
Author: dvzrv
Revision: 1425015
upgpkg: cycfx2prog 0.47-4: Rebuild to re-sign package.
Remove unnecessary quotes and curly braces.
Simplify make calls.
Add patch to honor CFLAGS/LDFLAGS (e.g. for full RELRO).
Added:
cycfx2prog/trunk/cycfx2prog-0.47-makefile.patch
Modified:
cycfx2prog/trunk/PKGBUILD
--------------------------------+
PKGBUILD | 33 +++++++++++++++++++++------------
cycfx2prog-0.47-makefile.patch | 31 +++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-21 18:02:14 UTC (rev 1425014)
+++ PKGBUILD 2023-03-21 18:20:27 UTC (rev 1425015)
@@ -2,23 +2,32 @@
pkgname=cycfx2prog
pkgver=0.47
-pkgrel=3
+pkgrel=4
pkgdesc='CycFX2Prog is a small and useful tool to program the FX2 and do basic
enpoint communication for testing purposes'
-arch=('x86_64')
+arch=(x86_64)
url='https://www.triplespark.net/elec/periph/USB-FX2/software/'
-license=('GPL2')
-depends=('libusb-compat')
-source=("$url/$pkgname-$pkgver.tar.gz")
-sha512sums=('089895f0c4b45012f9f9fc607a30c2e2897f360d270973354fa739cc456d2728080733461f6a3681422049599947461c05e5d9e7e598fc3c9fd6d5a7d89e346c')
+license=(GPL2)
+depends=(
+ glibc
+ libusb-compat
+)
+source=(
+ $url/$pkgname-$pkgver.tar.gz
+ $pkgname-0.47-makefile.patch
+)
+sha512sums=('089895f0c4b45012f9f9fc607a30c2e2897f360d270973354fa739cc456d2728080733461f6a3681422049599947461c05e5d9e7e598fc3c9fd6d5a7d89e346c'
+
'432ae4cad8743efe527a38966e120466783fc3b4d9a797d2e2a2ff8382d7413c2d98952efda713f3c5cfa61afd75533beae98187017145aa518f30264e0262c3')
+b2sums=('41fb12157cf03efed6ce40111bb6bef03c986828690b5f36b7250f9b00af3f1ac872703a8774b70353126a297f974964f55461d38eab2bada0754306433f20c7'
+
'2cb1628cd69a16a2f8a2dcad74df566b121eb8872d3038a3a9dcf8a844cf1101ef65bb793cc98980cc75ba0bda13ea0a6567a58a54c583e6d2c6d39f2501d742')
+prepare() {
+ # honor distribution CFLAGS/LDFLAGS
+ patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.47-makefile.patch
+}
build() {
- cd $pkgname-$pkgver
-
- make
+ make -C $pkgname-$pkgver
}
package() {
- cd $pkgname-$pkgver
-
- install -Dm 755 $pkgname "$pkgdir"/usr/bin/$pkgname
+ install -Dm 755 $pkgname-$pkgver/$pkgname -t "$pkgdir"/usr/bin/
}
Added: cycfx2prog-0.47-makefile.patch
===================================================================
--- cycfx2prog-0.47-makefile.patch (rev 0)
+++ cycfx2prog-0.47-makefile.patch 2023-03-21 18:20:27 UTC (rev 1425015)
@@ -0,0 +1,31 @@
+diff -ruN a/Makefile b/Makefile
+--- a/Makefile 2009-12-06 18:55:28.000000000 +0100
++++ b/Makefile 2023-03-21 19:17:35.516241775 +0100
+@@ -1,15 +1,15 @@
+ CC = gcc -pipe
+ VERSION = 0.47
+-CFLAGS = -O2 -fno-rtti -fno-exceptions -DCYCFX2PROG_VERSION=\"$(VERSION)\" \
++CUSTOM_CFLAGS = -O2 -fno-rtti -fno-exceptions
-DCYCFX2PROG_VERSION=\"$(VERSION)\" \
+ -W -Wall -Wformat
+-LDFLAGS = -lusb
++CUSTOM_LDFLAGS = -lusb
+ DIST_DEST = cycfx2prog-$(VERSION)
+
+ all: cycfx2prog
+
+ # NOTE: Also add sources to the "dist:" target!
+ cycfx2prog: cycfx2prog.o cycfx2dev.o
+- $(CC) $(LDFLAGS) cycfx2prog.o cycfx2dev.o -o cycfx2prog
++ $(CC) $(CFLAGS) $(CUSTOM_LDFLAGS) $(LDFLAGS) cycfx2prog.o cycfx2dev.o
-o cycfx2prog
+
+ clean:
+ -rm -f *.o
+@@ -26,7 +26,7 @@
+ rm -r "$(DIST_DEST)"
+
+ .cc.o:
+- $(CC) -c $(CFLAGS) $<
++ $(CC) -c $(CFLAGS) $(CUSTOM_CFLAGS) $<
+
+ cycfx2dev.o: cycfx2dev.cc cycfx2dev.h
+ cycfx2prog.o: cycfx2prog.cc cycfx2dev.h
