[PR PATCH] modsecurity: fix cross-build

[PR PATCH] modsecurity: fix cross-build

[ndowens]

[-- 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
 }

Re: [PR REVIEW] modsecurity: fix cross-build

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27434#discussion_r549227982

Comment:
please vsed.

Re: [PR PATCH] [Updated] modsecurity: fix cross-build

[ndowens]

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

There is an updated 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: 1166 bytes --]

From c5f452070d46c17f2882be398b594c6a57c97954 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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 4f550b43027..9ab94af0fed 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
+	vsed -i '/^hardcode_into_libs=.*/s,yes,no,' libtool
 }

Re: [PR REVIEW] modsecurity: fix cross-build

[ndowens]

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

New review comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/27434#discussion_r549374806

Comment:
Done, usually I notice and fix those lines :)

Re: [PR PATCH] [Merged]: modsecurity: fix cross-build

[ericonr]

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

There's a merged pull request on the void-packages repository

modsecurity: fix cross-build
https://github.com/void-linux/void-packages/pull/27434

Description: