[packages/john.git] / optflags.patch

--- john-1.8.0/src/Makefile~	2014-07-12 11:00:44.000000000 +0300
+++ john-1.8.0/src/Makefile	2014-07-12 11:05:24.241585854 +0300
@@ -28,7 +28,7 @@
 #OMPFLAGS = -fopenmp -D_FORTIFY_SOURCE=0
 # Sun Studio with OpenMP (set the OMP_NUM_THREADS env var at runtime)
 #OMPFLAGS = -xopenmp
-CFLAGS = -c -Wall -Wdeclaration-after-statement -O2 -fomit-frame-pointer $(OMPFLAGS)
+CFLAGS = -c $(OPTFLAGS) -Wdeclaration-after-statement -fomit-frame-pointer $(OMPFLAGS)
 # CFLAGS for use on the main john.c file only
 CFLAGS_MAIN = $(CFLAGS)
 ASFLAGS = -c $(OMPFLAGS)
@@ -28,6 +28,7 @@
 OPT_NORMAL = -funroll-loops
 # Remove the "-Os" if you're using an ancient version of gcc
 OPT_INLINE = -Os -funroll-loops -finline-functions
+OPTFLAGS = -Wall -O2
 
 JOHN_OBJS = \
 	DES_fmt.o DES_std.o DES_bs.o DES_bs_b.o \
Commit	Line	Data
3dbf4b73 ER	1	--- john-1.8.0/src/Makefile~ 2014-07-12 11:00:44.000000000 +0300
	2	+++ john-1.8.0/src/Makefile 2014-07-12 11:05:24.241585854 +0300
	3	@@ -28,7 +28,7 @@
	4	#OMPFLAGS = -fopenmp -D_FORTIFY_SOURCE=0
3443e32b ER	5	# Sun Studio with OpenMP (set the OMP_NUM_THREADS env var at runtime)
3443e32b ER	6	#OMPFLAGS = -xopenmp
3dbf4b73 ER	7	-CFLAGS = -c -Wall -Wdeclaration-after-statement -O2 -fomit-frame-pointer $(OMPFLAGS)
3dbf4b73 ER	8	+CFLAGS = -c $(OPTFLAGS) -Wdeclaration-after-statement -fomit-frame-pointer $(OMPFLAGS)
2f02f703 JB	9	# CFLAGS for use on the main john.c file only
2f02f703 JB	10	CFLAGS_MAIN = $(CFLAGS)
3443e32b	11	ASFLAGS = -c $(OMPFLAGS)
2f02f703	12	@@ -28,6 +28,7 @@
3443e32b	13	OPT_NORMAL = -funroll-loops
2f02f703 JB	14	# Remove the "-Os" if you're using an ancient version of gcc
2f02f703 JB	15	OPT_INLINE = -Os -funroll-loops -finline-functions
3443e32b ER	16	+OPTFLAGS = -Wall -O2
	17
	18	JOHN_OBJS = \
	19	DES_fmt.o DES_std.o DES_bs.o DES_bs_b.o \