diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2000-02-07 02:45:45 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2000-02-07 02:45:45 +0000 |
| commit | e0eb3825543f8fa1f58cea1bb82b7219cc5befee (patch) | |
| tree | ab3c9b822ef09cce00a39f9c7afa37468a96e2e5 /security/john | |
| parent | Update to DDD version 3.2. (diff) | |
Respect CC and CFLAGS
Notes
Notes:
svn path=/head/; revision=25542
Diffstat (limited to 'security/john')
| -rw-r--r-- | security/john/files/patch-aa | 48 |
1 files changed, 41 insertions, 7 deletions
diff --git a/security/john/files/patch-aa b/security/john/files/patch-aa index 8c25ca26c821..1fdee295e7d7 100644 --- a/security/john/files/patch-aa +++ b/security/john/files/patch-aa @@ -1,6 +1,30 @@ ---- Makefile.orig Sun Sep 19 16:22:44 1999 -+++ Makefile Sun Sep 19 16:25:16 1999 -@@ -89,6 +89,7 @@ +--- Makefile.orig Wed Dec 2 16:29:50 1998 ++++ Makefile Sun Feb 6 18:00:15 2000 +@@ -3,17 +3,18 @@ + # Copyright (c) 1996-98 by Solar Designer + # + +-CPP = gcc +-CC = gcc +-AS = gcc +-LD = gcc ++CC ?= gcc ++CPP = $(CC) ++AS = $(CC) ++LD = $(CC) + CP = cp + LN = ln -sf + RM = rm -f + SED = sed + NULL = /dev/null + CPPFLAGS = -E +-CFLAGS = -c -Wall -O2 -fomit-frame-pointer ++CFLAGS ?= -O2 ++CFLAGS += -c -Wall -fomit-frame-pointer + ASFLAGS = -c + LDFLAGS = -s + OPT_NORMAL = -funroll-loops +@@ -89,6 +90,7 @@ @echo "freebsd-x86-any-a.out FreeBSD, x86, a.out binaries" @echo "freebsd-x86-k6-a.out FreeBSD, AMD K6, a.out binaries" @echo "freebsd-x86-any-elf FreeBSD, x86, ELF binaries" @@ -8,15 +32,25 @@ @echo "freebsd-x86-mmx-elf FreeBSD, x86 with MMX, ELF binaries" @echo "freebsd-x86-k6-elf FreeBSD, AMD K6, ELF binaries" @echo "openbsd-x86-any OpenBSD, x86" -@@ -175,6 +176,11 @@ +@@ -173,14 +175,19 @@ + $(LN) x86-any.h arch.h + $(MAKE) $(PROJ) \ JOHN_OBJS="$(JOHN_OBJS) x86.o" \ - CFLAGS="$(CFLAGS) -m486" \ +- CFLAGS="$(CFLAGS) -m486" \ ++ CFLAGS="$(CFLAGS)" \ ASFLAGS="$(ASFLAGS) -DBSD" -+ + +freebsd-alpha-any-elf: + $(LN) alpha.h arch.h + $(MAKE) $(PROJ) \ + JOHN_OBJS="$(BITSLICE_OBJS) $(JOHN_OBJS) alpha.o" - ++ freebsd-x86-mmx-elf: $(LN) x86-mmx.h arch.h + $(MAKE) $(PROJ) \ + JOHN_OBJS="$(JOHN_OBJS) x86.o" \ +- CFLAGS="$(CFLAGS) -m486" \ ++ CFLAGS="$(CFLAGS)" \ + ASFLAGS="$(ASFLAGS) -DBSD" + + freebsd-x86-k6-elf: |