diff options
| author | Chris Piazza <cpiazza@FreeBSD.org> | 1999-07-24 06:09:46 +0000 |
|---|---|---|
| committer | Chris Piazza <cpiazza@FreeBSD.org> | 1999-07-24 06:09:46 +0000 |
| commit | 9084228b18f85c05f4a3868a3ef0e2e56584f84b (patch) | |
| tree | 9c138fc057bfbdd098446edadf8f2b1bd755791b /net/sharity-light/files | |
| parent | Create a directory before installing data to it in case it wasn't (diff) | |
Unbreak, ARCH was being passed through to the Makefiles
resulting in cc -I... i386 -c ... etc being used.
Noticed by: bento.freebsd.org
Notes
Notes:
svn path=/head/; revision=20338
Diffstat (limited to 'net/sharity-light/files')
| -rw-r--r-- | net/sharity-light/files/patch-aa | 18 | ||||
| -rw-r--r-- | net/sharity-light/files/patch-ad | 22 |
2 files changed, 38 insertions, 2 deletions
diff --git a/net/sharity-light/files/patch-aa b/net/sharity-light/files/patch-aa new file mode 100644 index 000000000000..acff629ab8ee --- /dev/null +++ b/net/sharity-light/files/patch-aa @@ -0,0 +1,18 @@ +--- nfs/Makefile.orig Sat Jul 24 23:05:05 1999 ++++ nfs/Makefile Sat Jul 24 23:05:17 1999 +@@ -16,13 +16,13 @@ + + all: nfs.o + +-COMPILE = $(CC) $(ARCH) -c $(INCLUDES) $(CFLAGS) ++COMPILE = $(CC) -c $(INCLUDES) $(CFLAGS) + + .c.o: + $(COMPILE) $< + + nfs.o: $(OFILES) +- $(LD) $(ARCH) -r -o $@ $(OFILES) ++ $(LD) -r -o $@ $(OFILES) + + # the purpose of the sed "s/char data/long long data/" hack is to ensure + # proper alignment. [Marc Boucher <marc@CAM.ORG>] diff --git a/net/sharity-light/files/patch-ad b/net/sharity-light/files/patch-ad index be51b6c7ee72..c287945cc7e8 100644 --- a/net/sharity-light/files/patch-ad +++ b/net/sharity-light/files/patch-ad @@ -1,5 +1,5 @@ ---- Makefile.orig Mon Jan 4 19:07:31 1999 -+++ Makefile Mon Jan 4 19:08:07 1999 +--- Makefile.orig Tue Nov 24 05:52:13 1998 ++++ Makefile Sat Jul 24 23:04:14 1999 @@ -12,11 +12,11 @@ ############################################################################## @@ -29,3 +29,21 @@ # For NetBsd #CFLAGS = -Wall -O2 -DNETBSD +@@ -66,7 +66,7 @@ + OFILES = proc.o sock.o rumba.o psinode.o kernel.o smb_abstraction.o fo_nfs.o + + .c.o: +- $(CC) $(CFLAGS) $(ARCH) -c -o $*.o $< ++ $(CC) $(CFLAGS) -c -o $*.o $< + + all: $(NAME) + +@@ -74,7 +74,7 @@ + (cd nfs; $(MAKE) "CFLAGS=$(CFLAGS)" "CC=$(THE_CC)" "ARCH=$(ARCH)" "RPC_WARNFLAGS=$(RPC_WARNFLAGS)") + + $(NAME): $(OFILES) nfs_dir +- $(CC) $(LDFLAGS) $(ARCH) -o $(NAME) $(OFILES) nfs/nfs.o $(LIBS) ++ $(CC) $(LDFLAGS) -o $(NAME) $(OFILES) nfs/nfs.o $(LIBS) + + clean: + rm -f $(OFILES) |