From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Fix some gnu-makefile build style users
Date: Thu, 10 Dec 2020 16:12:36 +0100 [thread overview]
Message-ID: <20201210151236.ynWGT8yxm4BIayQpDcyM8pumOhUTpAeFDP8vBqOTmuI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27005@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 394 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages makefile
https://github.com/void-linux/void-packages/pull/27005
Fix some gnu-makefile build style users
Mainly depends on the change from #27003 for CXXFLAGS inclusion.
A patch file from https://github.com/void-linux/void-packages/pull/27005.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-makefile-27005.patch --]
[-- Type: text/x-diff, Size: 3748 bytes --]
From 1bead26d98194b56ec3a208912bf0904d2c3cf40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:55:56 -0300
Subject: [PATCH 1/4] crypto++: remove CXXFLAGS workaround.
No longer necessary.
---
srcpkgs/crypto++/template | 3 ---
1 file changed, 3 deletions(-)
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index d56e7ff2c20..18ed0314e3d 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -21,9 +21,6 @@ if [ "$XBPS_CROSS" ]; then
make_build_args+=" -f GNUmakefile-cross"
fi
-post_extract() {
- sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
-}
post_install() {
vlicense License.txt LICENSE
}
From e2342c121ccab7006699cf343fcf0fc82bdc8a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:15 -0300
Subject: [PATCH 2/4] espeak: remove CXXFLAGS workaround.
No longer necessary.
---
srcpkgs/espeak/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
index 354ae5d6988..4161b04dd94 100644
--- a/srcpkgs/espeak/template
+++ b/srcpkgs/espeak/template
@@ -5,6 +5,7 @@ revision=5
wrksrc="${pkgname}-${version}-source"
build_wrksrc=src
build_style=gnu-makefile
+make_build_args="AUDIO=runtime"
hostmakedepends="unzip"
makedepends="pulseaudio-devel portaudio-devel"
short_desc="Text to Speech engine"
@@ -18,10 +19,6 @@ pre_configure() {
cp portaudio19.h portaudio.h
}
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
libespeak_package() {
short_desc+=" - runtime libraries"
pkg_install() {
From 9dc1b6e34e49ef24b70566c3db9c0f77e699f030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:29 -0300
Subject: [PATCH 3/4] fuse-zip: remove CXXFLAGS workaround.
No longer necessary.
Also fix distfile location, for some reason the 0.7.1 tarball had been
removed from downloads.
---
srcpkgs/fuse-zip/template | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index db224196e5c..5b7859ce824 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -2,6 +2,7 @@
pkgname=fuse-zip
version=0.7.1
revision=1
+wrksrc=agalanin-fuse-zip-0865d60054d9
build_style=gnu-makefile
make_build_args="all doc"
make_install_args="prefix=/usr"
@@ -11,9 +12,5 @@ short_desc="FUSE file system for ZIP archives"
maintainer="Matthias von Faber <mvf@gmx.eu>"
license="GPL-3.0-or-later"
homepage="https://bitbucket.org/agalanin/fuse-zip"
-distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
-checksum=7dac61c3f27f9041545ab1a22bb772ea282ed2dea25a0220dcecfa6801b5b121
-
-pre_build() {
- vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
-}
+distfiles="${homepage}/get/${version}.tar.gz"
+checksum=771302586ca734bf845effcea999c38f4c2e984e29605912eb3470fbeea0b195
From 1ab3bfc468dea9738861b3e0d235dd28a2d6f999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:48 -0300
Subject: [PATCH 4/4] splix: remove unnecessary build_style.
---
srcpkgs/splix/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template
index 60315c5d7b6..a1405f0793c 100644
--- a/srcpkgs/splix/template
+++ b/srcpkgs/splix/template
@@ -3,7 +3,6 @@ pkgname=splix
version=2.0.0+svn315
revision=3
wrksrc="$pkgname-$version.orig"
-build_style=gnu-makefile
makedepends="cups-devel mit-krb5-devel jbigkit-devel"
short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
next prev parent reply other threads:[~2020-12-10 15:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-06 22:59 [PR PATCH] " ericonr
2020-12-10 15:12 ` ericonr [this message]
2020-12-11 2:07 ` [PR PATCH] [Updated] " ericonr
2020-12-11 2:21 ` ericonr
2021-01-25 19:21 ` [PR PATCH] [Updated] " ericonr
2021-01-25 19:25 ` ericonr
2021-01-25 19:30 ` ericonr
2021-01-25 19:31 ` ericonr
2021-01-25 23:23 ` mvf
2021-01-25 23:30 ` ericonr
2021-01-27 18:58 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201210151236.ynWGT8yxm4BIayQpDcyM8pumOhUTpAeFDP8vBqOTmuI@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).