diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2002-03-31 02:39:41 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2002-03-31 02:39:41 +0000 |
commit | b8afc9590c045bb08dbf6fbd15f0f603601ffcdd (patch) | |
tree | a9375a53a18d444d4aa2a0c70355ce5a3afcf005 /archivers | |
parent | Remove #include <malloc.h> (diff) |
Remove #include <malloc.h>
Respect CC and CFLAGS
Notes
Notes:
svn path=/head/; revision=57001
Diffstat (limited to 'archivers')
-rw-r--r-- | archivers/ha/Makefile | 6 | ||||
-rw-r--r-- | archivers/ha/files/patch-ab | 15 |
2 files changed, 20 insertions, 1 deletions
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile index b95699e0d00b..4efa687286a5 100644 --- a/archivers/ha/Makefile +++ b/archivers/ha/Makefile @@ -16,10 +16,14 @@ MAINTAINER= ache@FreeBSD.org NO_WRKSUBDIR= yes MAKEFILE= makefile.nix -MAKE_FLAGS= CC=cc -f ALL_TARGET= ha USE_GMAKE= yes +pre-patch: + @${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \ + ${WRKSRC}/c/hsc.c ${WRKSRC}/c/cpy.c \ + ${WRKSRC}/c/asc.c + do-install: cd ${WRKSRC}; ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ha ${PREFIX}/bin diff --git a/archivers/ha/files/patch-ab b/archivers/ha/files/patch-ab new file mode 100644 index 000000000000..65be1d557ba1 --- /dev/null +++ b/archivers/ha/files/patch-ab @@ -0,0 +1,15 @@ +--- makefile.nix.orig Wed Jan 11 23:26:26 1995 ++++ makefile.nix Sat Mar 30 18:39:08 2002 +@@ -21,10 +21,9 @@ + + MCH = nix + +-CC = gcc ++CC ?= gcc + CPP = $(CC) -E +-CFLAGS = -Wall -O2 -c -I../$(MCH) -I../include +-LDFLAGS = -O2 ++CFLAGS += -Wall -c -I../$(MCH) -I../include + + MDEFINES = "CC=$(CC)" "CPP=$(CPP)" "CFLAGS=$(CFLAGS)" "DEFS=$(DEFS)" + SUBDIRS = c $(MCH) include |