diff options
| author | Scott Mace <smace@FreeBSD.org> | 1998-09-16 13:46:17 +0000 |
|---|---|---|
| committer | Scott Mace <smace@FreeBSD.org> | 1998-09-16 13:46:17 +0000 |
| commit | fea283c19223de72016cd91b87070d29e4420287 (patch) | |
| tree | 7dc95ba85e36aa6d7db72f012be1288daabba60a /security/tcp_wrapper | |
| parent | Activate dap. (diff) | |
Fix build problem for aout
Notes
Notes:
svn path=/head/; revision=13176
Diffstat (limited to 'security/tcp_wrapper')
| -rw-r--r-- | security/tcp_wrapper/files/patch-aa | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/security/tcp_wrapper/files/patch-aa b/security/tcp_wrapper/files/patch-aa index 817875aa3acd..f90c70a71644 100644 --- a/security/tcp_wrapper/files/patch-aa +++ b/security/tcp_wrapper/files/patch-aa @@ -1,5 +1,5 @@ *** Makefile.orig Fri Mar 21 12:27:21 1997 ---- Makefile Tue Sep 15 09:55:40 1998 +--- Makefile Wed Sep 16 08:42:23 1998 *************** *** 47,53 **** #REAL_DAEMON_DIR=/usr/sbin @@ -191,12 +191,16 @@ # Invalidate all object files when the compiler options (CFLAGS) have changed. ---- 690,720 ---- +--- 690,726 ---- refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \ scaffold.h tcpdmatch.8 README.NIS ! LIB = libwrap.a +! .if ${PORTOBJFORMAT} == elf ! SLIB = libwrap.so.8 +! .else +! SLIB = libwrap.so.8.0 +! .endif ! ! all other: config-check $(LIB) $(SLIB) tcpd tcpdmatch try-from safe_finger tcpdchk ! @@ -205,7 +209,9 @@ ! tcpd.h ${PREFIX}/include ! ${INSTALL} -o ${BINOWN} -g ${BINGRP} -c -m 644 \ ! $(LIB) $(SLIB) ${PREFIX}/lib +! .if ${PORTOBJFORMAT} == elf ! (cd ${PREFIX}/lib;ln -sf $(SLIB) `echo $(SLIB) | sed 's/\.so.*$$/.so/'`) +! .endif ! ranlib ${PREFIX}/lib/$(LIB) ! ${INSTALL} -o ${BINOWN} -g ${BINGRP} -cs -m ${BINMODE} \ ! tcpd ${PREFIX}/libexec @@ -252,18 +258,18 @@ shar: $(KIT) @shar $(KIT) ---- 731,766 ---- +--- 737,772 ---- $(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ) -$(RANLIB) $(LIB) ! $(SLIB): $(LIB_OBJ:S/o$/so/g) shdata.so ! rm -f $(SLIB) -! .if defined(PORTOBJFORMAT) && ${PORTOBJFORMAT} == elf +! .if ${PORTOBJFORMAT} == elf ! $(CC) -o $(SLIB) -shared -Wl,-soname,$(SLIB) $(LIB_OBJ:S/o$/so/g) shdata.so +! ln -sf $(SLIB) `echo $(SLIB) | sed 's/\.so.*$$/.so/'` ! .else ! ld -Bshareable -o $(SLIB) $(LIB_OBJ:S/o$/so/g) shdata.so ! .endif -! ln -sf $(SLIB) `echo $(SLIB) | sed 's/\.so.*$$/.so/'` ! ! tcpd: tcpd.o $(SLIB) ! $(CC) $(CFLAGS) -o $@ tcpd.o -L. -lwrap $(LIBS) @@ -298,7 +304,7 @@ tidy: clean chmod -R a+r . ---- 776,782 ---- +--- 782,788 ---- clean: rm -f tcpd miscd safe_finger tcpdmatch tcpdchk try-from *.[oa] core \ |