Github messages for voidlinux
 help / color / mirror / Atom feed
From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] common/build-style/gnu-makefile.sh: define prefix, PREFIX for build
Date: Mon, 22 Aug 2022 07:28:56 +0200	[thread overview]
Message-ID: <20220822052856.31BP5xi9YyoBFviEExvlaUh5X8HEj7E5hc5F3cH6RtM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38823@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 662 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages gnu-make-build-pfx
https://github.com/void-linux/void-packages/pull/38823

common/build-style/gnu-makefile.sh: define prefix, PREFIX for build
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Should fix some issues where PREFIX or prefix is used during build, like with netsurf (b7853685fb20db4c91bbc5a1cd7a9cfe6c15cbd1)


A patch file from https://github.com/void-linux/void-packages/pull/38823.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnu-make-build-pfx-38823.patch --]
[-- Type: text/x-diff, Size: 1273 bytes --]

From eea69687cd2f866de8649b2fa0cb44ce14fb4eac Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 22 Aug 2022 00:40:54 -0400
Subject: [PATCH] common/build-style/gnu-makefile.sh: define prefix, PREFIX for
 build

---
 common/build-style/gnu-makefile.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh
index 04e407af255c..f81ef4e21db4 100644
--- a/common/build-style/gnu-makefile.sh
+++ b/common/build-style/gnu-makefile.sh
@@ -9,8 +9,10 @@ do_build() {
 			CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
 			CPP="$CPP" AS="$AS" OBJCOPY="$OBJCOPY" OBJDUMP="$OBJDUMP" \
 			CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
+			PREFIX=/usr prefix=/usr \
 			${makejobs} ${make_build_args} ${make_build_target}
 	else
+		export PREFIX=/usr prefix=/usr
 		${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
 	fi
 }
@@ -37,5 +39,5 @@ do_install() {
 	: ${make_cmd:=make}
 	: ${make_install_target:=install}
 
-	${make_cmd} STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+	${make_cmd} STRIP=true PREFIX=/usr prefix=/usr DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
 }

  parent reply	other threads:[~2022-08-22  5:28 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-22  4:42 [PR PATCH] " classabbyamp
2022-08-22  5:22 ` [PR REVIEW] " sgn
2022-08-22  5:28 ` classabbyamp [this message]
2022-08-22 12:09 ` ericonr
2022-08-22 22:58 ` [PR PATCH] [Updated] " classabbyamp
2022-08-22 23:00 ` classabbyamp
2022-08-22 23:05 ` [PR PATCH] [Updated] " classabbyamp
2022-08-24  6:27 ` classabbyamp
2022-08-24 19:06 ` classabbyamp
2022-08-24 19:07 ` [PR PATCH] [Merged]: " classabbyamp

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=20220822052856.31BP5xi9YyoBFviEExvlaUh5X8HEj7E5hc5F3cH6RtM@z \
    --to=classabbyamp@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).