diff options
Diffstat (limited to 'security/PAM/patches/patch-ag')
| -rw-r--r-- | security/PAM/patches/patch-ag | 69 |
1 files changed, 51 insertions, 18 deletions
diff --git a/security/PAM/patches/patch-ag b/security/PAM/patches/patch-ag index 4de2339b78f..a6c80f3703b 100644 --- a/security/PAM/patches/patch-ag +++ b/security/PAM/patches/patch-ag @@ -1,19 +1,52 @@ -$NetBSD: patch-ag,v 1.3 2002/12/23 21:23:58 jlam Exp $ +$NetBSD: patch-ag,v 1.4 2004/11/16 07:46:57 jlam Exp $ ---- modules/Makefile.orig Sun Dec 9 17:15:11 2001 -+++ modules/Makefile -@@ -12,7 +12,7 @@ MODDIRS=$(shell /bin/ls -d pam_*) - - all: - @echo building the static modutil library -- make -C pammodutil all -+ $(MAKE) -C pammodutil all - @echo modules sources available are: - @ls -d $(MODDIRS) 2>/dev/null ; echo :-------- - @echo -@@ -55,4 +55,4 @@ clean: lclean - $(MAKE) -C $$i clean ; \ - } fi ; \ - done -- make -C pammodutil clean -+ $(MAKE) -C pammodutil clean +--- modules/pammodutil/Makefile.orig 2001-12-09 17:15:12.000000000 -0500 ++++ modules/pammodutil/Makefile +@@ -25,10 +25,15 @@ LIBSTATIC = $(LIBNAME).a + + SLIBOBJECTS = $(addprefix static/,$(LIBOBJECTS) $(STATICOBJ)) + ++# libtool library name ++LIBLIBTOOL = $(LIBNAME).la ++ ++LALIBOBJECTS = $(LIBOBJECTS:.o=.lo) ++ + # --------------------------------------------- + ## rules + +-all: dirs $(LIBSTATIC) ../../Make.Rules ++all: dirs $(LIBLIBTOOL) ../../Make.Rules + + dirs: + $(MKDIR) static +@@ -36,10 +41,19 @@ dirs: + static/%.o : %.c + $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ + ++%.lo: %.c ++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< ++ + $(LIBSTATIC): $(SLIBOBJECTS) + ar cr $@ $(SLIBOBJECTS) + $(RANLIB) $@ + ++# This is a libtool convenience library that may be linked into shared ++# libraries and modules. ++# ++$(LIBLIBTOOL): $(LALIBOBJECTS) ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LALIBOBJECTS) -o $@ ++ + install: + @echo "at this time, we're not installing $(LIBSTATIC)" + +@@ -47,7 +61,8 @@ remove: + @echo "at this time, there is nothing to remove" + + clean: +- rm -f a.out core *~ static/*.o +- rm -f *.a *.o ++ rm -f a.out core *~ static/*.o .libs/* ++ rm -f *.a *.la *.la *.o + if [ -d dynamic ]; then rmdir dynamic ; fi + if [ -d static ]; then rmdir static ; fi ++ if [ -d libs ]; then rmdir .libs; fi |