From e28969d7b3c6269dd60e846b6702480f02303c39 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 23 Jul 2023 20:51:29 -0600 Subject: [PATCH 1/6] Add valgrind --- package/valgrind/package | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 package/valgrind/package diff --git a/package/valgrind/package b/package/valgrind/package new file mode 100644 index 000000000..fcbfea05b --- /dev/null +++ b/package/valgrind/package @@ -0,0 +1,25 @@ +pkgnames=(valgrind) +pkgdesc="Instrumentation framework for building dynamic analysis tools" +section="devel" +pkgver="3.21-1" +timestamp="2023-04-28T02:49:00Z" +maintainer="Eeems " +url=https://valgrind.org +license=MIT +source=(https://sourceware.org/pub/valgrind/valgrind-3.21.0.tar.bz2) +sha256sums=(10ce1618bb3e33fad16eb79552b0a3e1211762448a0d7fce11c8a6243b9ac971) +image=base:v2.3 +makedepends=(build:automake) + +build() { + ./autogen.sh + ./configure --prefix=/opt + make +} + +package() { + cd "$srcdir" + # Work around the make install not creating this directory + mkdir -p "$pkgdir"/opt/libexec/valgrind + make DESTDIR="$pkgdir" install +} From 3a448c5eeb05843a36982e7f382b1c8525887ab8 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 23 Jul 2023 20:55:20 -0600 Subject: [PATCH 2/6] Update version number to match expected style --- package/valgrind/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/valgrind/package b/package/valgrind/package index fcbfea05b..f030d8e92 100644 --- a/package/valgrind/package +++ b/package/valgrind/package @@ -1,7 +1,7 @@ pkgnames=(valgrind) pkgdesc="Instrumentation framework for building dynamic analysis tools" section="devel" -pkgver="3.21-1" +pkgver="3.21.0-1" timestamp="2023-04-28T02:49:00Z" maintainer="Eeems " url=https://valgrind.org From 130a43c38514bc6a8b26826bf0fd2c1d22bb6111 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 23 Jul 2023 21:13:27 -0600 Subject: [PATCH 3/6] Update recipie to get it building and fix license --- package/valgrind/package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/valgrind/package b/package/valgrind/package index f030d8e92..e8de8e674 100644 --- a/package/valgrind/package +++ b/package/valgrind/package @@ -5,11 +5,11 @@ pkgver="3.21.0-1" timestamp="2023-04-28T02:49:00Z" maintainer="Eeems " url=https://valgrind.org -license=MIT +license=GPL-2.0-only source=(https://sourceware.org/pub/valgrind/valgrind-3.21.0.tar.bz2) sha256sums=(10ce1618bb3e33fad16eb79552b0a3e1211762448a0d7fce11c8a6243b9ac971) image=base:v2.3 -makedepends=(build:automake) +makedepends=(build:gawk build:automake) build() { ./autogen.sh @@ -19,7 +19,7 @@ build() { package() { cd "$srcdir" - # Work around the make install not creating this directory + # Work around make install not creating this directory mkdir -p "$pkgdir"/opt/libexec/valgrind make DESTDIR="$pkgdir" install } From 1fac361f2dda607a28514960a4bfc6753246516c Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 23 Jul 2023 21:38:34 -0600 Subject: [PATCH 4/6] Retarget arm --- package/valgrind/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/valgrind/package b/package/valgrind/package index e8de8e674..be2c23d48 100644 --- a/package/valgrind/package +++ b/package/valgrind/package @@ -13,7 +13,7 @@ makedepends=(build:gawk build:automake) build() { ./autogen.sh - ./configure --prefix=/opt + ./configure --prefix=/opt --host=arm-linux-gnueabihf make } From 234120963b0e04d0f11bc912ad626d268799d236 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 23 Jul 2023 21:40:15 -0600 Subject: [PATCH 5/6] Fix unknown architecture --- package/valgrind/package | 1 + 1 file changed, 1 insertion(+) diff --git a/package/valgrind/package b/package/valgrind/package index be2c23d48..69b4967bd 100644 --- a/package/valgrind/package +++ b/package/valgrind/package @@ -14,6 +14,7 @@ makedepends=(build:gawk build:automake) build() { ./autogen.sh ./configure --prefix=/opt --host=arm-linux-gnueabihf + sed -i -e "s#armv7#arm#g" configure make } From e08de74865ef16e764537e55c75738e85c986875 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 23 Jul 2023 22:22:57 -0600 Subject: [PATCH 6/6] Move install to build to resolve error --- package/valgrind/package | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/package/valgrind/package b/package/valgrind/package index 69b4967bd..84618e3a7 100644 --- a/package/valgrind/package +++ b/package/valgrind/package @@ -12,15 +12,14 @@ image=base:v2.3 makedepends=(build:gawk build:automake) build() { - ./autogen.sh - ./configure --prefix=/opt --host=arm-linux-gnueabihf - sed -i -e "s#armv7#arm#g" configure + export CC=arm-linux-gnueabihf-gcc + ./autogen.sh --host armv7-linux-gnueabihf + ./configure --prefix=/opt --host=armv7-linux-gnueabihf --target=armv7-linux-gnueabihf make + mkdir -p out + make DESTDIR=$(pwd)/out install } package() { - cd "$srcdir" - # Work around make install not creating this directory - mkdir -p "$pkgdir"/opt/libexec/valgrind - make DESTDIR="$pkgdir" install + mv "$srcdir"/out/opt "$pkgdir"/ }