[packages/john] - added jumbo version dependencies, gomp and opencl bconds

qboosh qboosh at pld-linux.org
Sun Aug 30 12:28:03 CEST 2015


commit b282b6dc0100c4b7583c8ae888a1e317a98a652f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Aug 30 12:29:08 2015 +0200

    - added jumbo version dependencies, gomp and opencl bconds

 john.spec | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/john.spec b/john.spec
index c83c8e0..e152ba9 100644
--- a/john.spec
+++ b/john.spec
@@ -1,8 +1,13 @@
+# TODO:
+# - MPI support (if with jumbo)
+# - CUDA support on bcond (if with jumbo)
 #
 # Conditional build:
 %bcond_without	jumbo		# Build community-enhanced version with lots of contributed
 				# patches adding support for over 30
 				# of additional hash types, and more.
+%bcond_without	gomp		# OpenMP support (in jumbo version)
+%bcond_without	opencl		# OpenCL support (in jumbo version)
 %bcond_with	avx		# use x86 AVX instructions
 %bcond_with	xop		# use x86 XOP instructions
 %bcond_with	altivec		# use PPC Altivec instructions
@@ -52,10 +57,24 @@ Patch1:		optflags.patch
 Patch2:		jumbo-optflags.patch
 Patch3:		jumbo-x32.patch
 URL:		http://www.openwall.com/john/
-%{?with_jumbo:BuildRequires: openssl-devel >= 0.9.7}
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
+%if %{with jumbo}
+%{?with_opencl:BuildRequires:	OpenCL-devel}
+BuildRequires:	bzip2-devel
+%{?with_gomp:BuildRequires:	gcc >= 6:4.2}
+BuildRequires:	gmp-devel
+%{?with_gomp:BuildRequires:	libgomp-devel}
+# for SIPdump and vncpcap2john binaries, which are not packaged
+#BuildRequires:	libpcap-devel
+BuildRequires:	openssl-devel >= 0.9.7
+BuildRequires:	pkgconfig
+%ifarch %{ix86} %{x8664} x32
+BuildRequires:	yasm
+%endif
+BuildRequires:	zlib-devel
+%endif
 Requires:	words
 %ifarch %{ix86} %{x8664}
 %if %{with xop}
@@ -109,7 +128,9 @@ cd src
 %ifarch x32
 ax_intel_x32=yes \
 %endif
-%configure
+%configure \
+	%{!?with_opencl:--disable-opencl} \
+	%{!?with_gomp:--disable-openmp}
 %{__make}
 %else
 cat > defs.h <<'EOF'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/john.git/commitdiff/b282b6dc0100c4b7583c8ae888a1e317a98a652f



More information about the pld-cvs-commit mailing list