[PR PATCH] unrar: strip out native compilation flag

[PR PATCH] unrar: strip out native compilation flag

[Zapeth]

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

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

https://github.com/Zapeth/void-packages unrar-patch
https://github.com/void-linux/void-packages/pull/50557

unrar: strip out native compilation flag
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

This should get rid of the native compilation flag in the makefile script.

Not sure if it was included upstream by mistake, but it should be looked out for when new versions are released (ie revert this change if the flag gets removed again).

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

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

From 9307170d3a5387e1be4a9721ee0c79149597f21b Mon Sep 17 00:00:00 2001
From: Zapeth <Zapeth@users.noreply.github.com>
Date: Tue, 28 May 2024 16:02:55 +0200
Subject: [PATCH] unrar: strip out native compilation flag

---
 srcpkgs/unrar/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index 105c51b84bf33b..46f7375ca85090 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,7 +1,7 @@
 # Template file for 'unrar'
 pkgname=unrar
 version=7.0.9
-revision=1
+revision=2
 archs="x86_64* i686*"
 short_desc="Unarchiver for .rar files (non-free version)"
 maintainer="skmpz <dem.procopiou@gmail.com>"
@@ -12,13 +12,12 @@ checksum=505c13f9e4c54c01546f2e29b2fcc2d7fabc856a060b81e5cdfe6012a9198326
 repository=nonfree
 
 do_build() {
-	vsed -e 's/^\(CXXFLAGS\)=\(.*\)/\1+=\2/' \
+	vsed -e 's/^\(CXXFLAGS\)=-march=native \(.*\)/\1+=\2/' \
 		 -e 's/^\(LDFLAGS\)=\(.*\)/\1+=-lpthread \2/' \
 		 -i makefile
 	make CXX="$CXX" LD="$LD" STRIP=: -f makefile
-	# early install of unrar because makefile deletes unrar on lib creation
+	# early install of unrar because need to clean for lib creation
 	vbin unrar
-	# recompile for lib
 	make clean
 	make CXX="$CXX" LD="$LD" STRIP=: -f makefile lib
 }

Re: [PR REVIEW] unrar: strip out native compilation flag

[vincele]

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

New review comment by vincele on void-packages repository

https://github.com/void-linux/void-packages/pull/50557#discussion_r1632328658

Comment:
This does not look related to patch subject

Re: [PR REVIEW] unrar: strip out native compilation flag

[vincele]

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

New review comment by vincele on void-packages repository

https://github.com/void-linux/void-packages/pull/50557#discussion_r1632328607

Comment:
same

Re: [PR REVIEW] unrar: strip out native compilation flag

[vincele]

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

New review comment by vincele on void-packages repository

https://github.com/void-linux/void-packages/pull/50557#discussion_r1632335018

Comment:
This is assuming  '-march=native' is always the first in CXXFLAGS
Is that a safe assumption ?

Re: [PR REVIEW] unrar: strip out native compilation flag

[Zapeth]

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

New review comment by Zapeth on void-packages repository

https://github.com/void-linux/void-packages/pull/50557#discussion_r1632351388

Comment:
Yes, for version 7.0.9 it is (upstream makefile has it hardcoded like that), I wouldn't expect them to re-release the same version with the flag (re)moved.

Re: [PR REVIEW] unrar: strip out native compilation flag

[Zapeth]

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

New review comment by Zapeth on void-packages repository

https://github.com/void-linux/void-packages/pull/50557#discussion_r1632351692

Comment:
Its just a small comment correction (along with the other comment change), but if thats not appropriate to include in the PR then I'll remove it.

Re: [PR REVIEW] unrar: strip out native compilation flag

[vincele]

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

New review comment by vincele on void-packages repository

https://github.com/void-linux/void-packages/pull/50557#discussion_r1632357969

Comment:
I'm no authority on the subject, that was just a comment while passing by, feel free to ignore

Re: [PR REVIEW] unrar: strip out native compilation flag

[vincele]

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

New review comment by vincele on void-packages repository

https://github.com/void-linux/void-packages/pull/50557#discussion_r1632358468

Comment:
OK, as-is it' no problem, but if upstream changes that in the future, it may be a (slight) trap for the one updating the void packaging. But that does not look like a big problem, just if it does not match the regex, the flag will be used again... Feel free to ignore this comment as well.

Re: [PR PATCH] [Closed]: unrar: strip out native compilation flag

[classabbyamp]

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

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

unrar: strip out native compilation flag
https://github.com/void-linux/void-packages/pull/50557

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

This should get rid of the native compilation flag in the makefile script.

Not sure if it was included upstream by mistake, but it should be looked out for when new versions are released (ie revert this change if the flag gets removed again).