* [PR PATCH] Fix zita and gnu-makefile
@ 2020-12-06 22:26 ericonr
2020-12-07 1:03 ` [PR PATCH] [Merged]: " ericonr
0 siblings, 1 reply; 2+ messages in thread
From: ericonr @ 2020-12-06 22:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages zita
https://github.com/void-linux/void-packages/pull/27003
Fix zita and gnu-makefile
A patch file from https://github.com/void-linux/void-packages/pull/27003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zita-27003.patch --]
[-- Type: text/x-diff, Size: 2447 bytes --]
From 24314664306fd0644019156639dfb90cbd665594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:20:35 -0300
Subject: [PATCH 1/2] common/build-style/gnu-makefile: pass CXXFLAGS in make
invocation.
---
common/build-style/gnu-makefile.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh
index 82e91ef2d13..d7ea148fc48 100644
--- a/common/build-style/gnu-makefile.sh
+++ b/common/build-style/gnu-makefile.sh
@@ -8,7 +8,7 @@ do_build() {
${make_cmd} \
CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
CPP="$CPP" AS="$AS" OBJCOPY="$OBJCOPY" OBJDUMP="$OBJDUMP" \
- CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
${makejobs} ${make_build_args} ${make_build_target}
else
${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
From 9d91eebafbf7066321d38c5a960029943707a160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:23:03 -0300
Subject: [PATCH 2/2] zita-at1: fix resource location.
It install resources in /usr/share, but was built with
PREFIX=/usr/local/share. This commit passes PREFIX=/usr during build
time to fix that.
Also:
- Use vsed instead of sed
- Remove unnecessary sed for -march=native, issue now fixed in the
gnu-makefile style
Fixes #27002.
---
srcpkgs/zita-at1/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zita-at1/template b/srcpkgs/zita-at1/template
index 764e62a0262..c92d4c699e3 100644
--- a/srcpkgs/zita-at1/template
+++ b/srcpkgs/zita-at1/template
@@ -1,9 +1,10 @@
# Template file for 'zita-at1'
pkgname=zita-at1
version=0.6.2
-revision=1
+revision=2
build_wrksrc=source
build_style=gnu-makefile
+make_build_args="PREFIX=/usr"
hostmakedepends="pkg-config"
makedepends="clxclient-devel clthreads-devel zita-resampler-devel cairo-devel
freetype-devel fftw-devel jack-devel libpng-devel libXft-devel libX11-devel"
@@ -15,7 +16,6 @@ distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${
checksum=19bb3ddc02b32d6ad15fdd928ee66c2e5bb5e4c7fe465c431e98c2fd83b1ae57
pre_build() {
- sed -i '/march=native/d' Makefile
# change pkgconf to pkg-config
- sed -i 's/pkgconf/pkg-config/' Makefile
+ vsed -e 's/pkgconf/pkg-config/' -i Makefile
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: Fix zita and gnu-makefile
2020-12-06 22:26 [PR PATCH] Fix zita and gnu-makefile ericonr
@ 2020-12-07 1:03 ` ericonr
0 siblings, 0 replies; 2+ messages in thread
From: ericonr @ 2020-12-07 1:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
There's a merged pull request on the void-packages repository
Fix zita and gnu-makefile
https://github.com/void-linux/void-packages/pull/27003
Description:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-07 1:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-06 22:26 [PR PATCH] Fix zita and gnu-makefile ericonr
2020-12-07 1:03 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).