Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [RFC] john: make simd a build option, off by default
@ 2020-05-31 15:42 abenson
  2020-05-31 15:48 ` [PR PATCH] [Updated] " abenson
  2020-05-31 15:59 ` [PR PATCH] [Merged]: " abenson
  0 siblings, 2 replies; 3+ messages in thread
From: abenson @ 2020-05-31 15:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages fix_john_simd
https://github.com/void-linux/void-packages/pull/22467

[RFC] john: make simd a build option, off by default
This solves the problem of SIMD features being enabled and leaking in on all
architectures, not just ppc*. It is now provided as a build option if there
if is a want/need to enable these for custom builds.

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

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

From 169167a227d13022aef518e5683a08ce896cd691 Mon Sep 17 00:00:00 2001
From: Andrew Benson <andrew.benson.2@us.af.mil>
Date: Sun, 31 May 2020 10:39:23 -0500
Subject: [PATCH] john: make simd a build option, off by default

This solves the problem of SIMD features being enabled and leaking in on all
architectures, not just ppc*. It is now provided as a build option if there
if is a want/need to enable these for custom builds.
---
 srcpkgs/john/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index 21c23d89d36..17da06a04c6 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,12 +1,12 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=1
+revision=2
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
-configure_args="--with-systemwide"
+configure_args="--with-systemwide $(vopt_if simd --enable-simd --disable-simd)"
 makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
@@ -16,13 +16,7 @@ distfiles="$homepage/k/$pkgname-${version}-jumbo-${_jumbover}.tar.xz"
 checksum=f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
 python_version=2 #unverified
 
-# the build system checks the host cpu for features, so when building on
-# a modern power9 system, it will attempt to shove in -mvsx and so on,
-# which breaks builds for 970 and 32-bit
-case "$XBPS_TARGET_MACHINE" in
-	ppc64le*) ;;
-	ppc*) configure_args+=" --disable-simd";;
-esac
+build_options="simd"
 
 pre_configure() {
 	unset CPP AS LD

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] [RFC] john: make simd a build option, off by default
  2020-05-31 15:42 [PR PATCH] [RFC] john: make simd a build option, off by default abenson
@ 2020-05-31 15:48 ` abenson
  2020-05-31 15:59 ` [PR PATCH] [Merged]: " abenson
  1 sibling, 0 replies; 3+ messages in thread
From: abenson @ 2020-05-31 15:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages fix_john_simd
https://github.com/void-linux/void-packages/pull/22467

[RFC] john: make simd a build option, off by default
This solves the problem of SIMD features being enabled and leaking in on all
architectures, not just ppc*. It is now provided as a build option if there
if is a want/need to enable these for custom builds.

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

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

From dd40427aef8e23c82cb45a634064cb023067bfb9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <andrew.benson.2@us.af.mil>
Date: Sun, 31 May 2020 10:39:23 -0500
Subject: [PATCH] john: make simd a build option, off by default

This solves the problem of SIMD features being enabled and leaking in on all
architectures, not just ppc*. It is now provided as a build option if there
if is a want/need to enable these for custom builds.
---
 srcpkgs/john/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index 21c23d89d36..bb5fd8cdbba 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,12 +1,12 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=1
+revision=2
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
-configure_args="--with-systemwide"
+configure_args="--with-systemwide $(vopt_enable simd)"
 makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
@@ -16,13 +16,7 @@ distfiles="$homepage/k/$pkgname-${version}-jumbo-${_jumbover}.tar.xz"
 checksum=f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
 python_version=2 #unverified
 
-# the build system checks the host cpu for features, so when building on
-# a modern power9 system, it will attempt to shove in -mvsx and so on,
-# which breaks builds for 970 and 32-bit
-case "$XBPS_TARGET_MACHINE" in
-	ppc64le*) ;;
-	ppc*) configure_args+=" --disable-simd";;
-esac
+build_options="simd"
 
 pre_configure() {
 	unset CPP AS LD

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: [RFC] john: make simd a build option, off by default
  2020-05-31 15:42 [PR PATCH] [RFC] john: make simd a build option, off by default abenson
  2020-05-31 15:48 ` [PR PATCH] [Updated] " abenson
@ 2020-05-31 15:59 ` abenson
  1 sibling, 0 replies; 3+ messages in thread
From: abenson @ 2020-05-31 15:59 UTC (permalink / raw)
  To: ml

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

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

[RFC] john: make simd a build option, off by default
https://github.com/void-linux/void-packages/pull/22467

Description:
This solves the problem of SIMD features being enabled and leaking in on all
architectures, not just ppc*. It is now provided as a build option if there
if is a want/need to enable these for custom builds.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-05-31 15:59 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-31 15:42 [PR PATCH] [RFC] john: make simd a build option, off by default abenson
2020-05-31 15:48 ` [PR PATCH] [Updated] " abenson
2020-05-31 15:59 ` [PR PATCH] [Merged]: " abenson

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).