Github messages for voidlinux
 help / color / mirror / Atom feed
From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] modsecurity: fix cross-build
Date: Sat, 26 Dec 2020 00:43:47 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27434@inbox.vuxu.org> (raw)

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

There is a new pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages modsecurity
https://github.com/void-linux/void-packages/pull/27434

modsecurity: fix cross-build


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-modsecurity-27434.patch --]
[-- Type: text/x-diff, Size: 1109 bytes --]

From 44d31aac4e12f93ad276679900e0cfaa004fab47 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 25 Dec 2020 17:44:48 -0600
Subject: [PATCH] modsecurity: fix cross-build

---
 srcpkgs/modsecurity/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 4f550b43027..4914d2330eb 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -15,12 +15,16 @@ license="Apache-2.0"
 homepage="https://www.modsecurity.org"
 distfiles="https://github.com/SpiderLabs/ModSecurity/releases/download/v${version}/modsecurity-v${version}.tar.gz"
 checksum=b4231177dd80b4e076b228e57d498670113b69d445bab86db25f65346c24db22
-nocross="configure: error: cannot check for file existence when cross compiling"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" $makedepends"
 fi
 
+pre_configure() {
+	# Use target paths or will link against host libs
+	vsed -e "s,\${path},${XBPS_CROSS_BASE}/usr,g"	-i configure
+}
+
 pre_build() {
 	sed -ri 's|(hardcode_into_libs)=.*|\1=no|' libtool
 }

             reply	other threads:[~2020-12-25 23:43 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-25 23:43 ndowens [this message]
2020-12-28  6:14 ` [PR REVIEW] " ericonr
2020-12-28 14:51 ` [PR PATCH] [Updated] " ndowens
2020-12-28 14:52 ` [PR REVIEW] " ndowens
2020-12-28 16:28 ` [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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27434@inbox.vuxu.org \
    --to=ndowens@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).