diff options
Diffstat (limited to 'net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch')
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch | 144 |
1 files changed, 144 insertions, 0 deletions
diff --git a/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch b/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch new file mode 100644 index 0000000..029dcc5 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch @@ -0,0 +1,144 @@ +--- configure.in.old 2010-05-29 17:17:06.242996467 +0200 ++++ configure.in 2010-05-29 17:19:23.453749422 +0200 +@@ -173,7 +173,7 @@ AC_ARG_WITH(hesiod, + : Search for Hesiod in normal directory path + else + : Search for Hesiod in specific directory +- LDFLAGS="$LDFLAGS -L${withval}/lib" ++ LDFLAGS="$LDFLAGS -Wl,--no-as-needed -L${withval}/lib" + LIBHESIOD="-L${withval}/lib" + HESIOD_FLAGS="-I${withval}/include" + fi +--- Makefile.conf.in.old 2010-05-27 16:25:30.136149753 +0200 ++++ Makefile.conf.in 2010-05-27 16:27:29.736148646 +0200 +@@ -90,3 +90,5 @@ + # Location for init.d files + initdir = @initdir@ + ++# Use the compiler determined by configure ++CC := @CC@ +--- Makefile.rules.old 2010-05-27 16:25:26.722150726 +0200 ++++ Makefile.rules 2010-05-27 16:35:52.030400349 +0200 +@@ -16,8 +16,6 @@ + AUTOFS_LIB = ../lib/autofs.a + + # Compilers, linkers and flags +-# The STRIP defined here *must not* remove any dynamic-loading symbols +- + ifdef DMALLOCLIB + DEBUG=1 + endif +@@ -24,36 +24,24 @@ + + ifdef DEBUG + CFLAGS ?= -g -Wall -DDEBUG +-LDFLAGS = -g +-STRIP = : + else +-ifdef DONTSTRIP + CFLAGS ?= -O2 -g +-LDFLAGS = -g +-STRIP = : +-else +-CFLAGS ?= -O2 -Wall +-LDFLAGS = -s +-STRIP = strip --strip-debug +-endif + endif ++AUTOFS_LDFLAGS = -g + +-CC = gcc +-CXX = g++ + CXXFLAGS = $(CFLAGS) + LD = ld + SOLDFLAGS = -shared + + CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 +-LDFLAGS += -lpthread + + ifdef TIRPCLIB + CFLAGS += -I/usr/include/tirpc +-LDFLAGS += $(TIRPCLIB) ++AUTOFS_LDFLAGS += $(TIRPCLIB) + endif + + ifdef DMALLOCLIB +-LDFLAGS += $(DMALLOCLIB) ++AUTOFS_LDFLAGS += $(DMALLOCLIB) + endif + + # Standard rules +@@ -56,4 +54,3 @@ + + .c.so: + $(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL) +- $(STRIP) $*.so +--- daemon/Makefile.old 2010-05-27 16:37:18.755178257 +0200 ++++ daemon/Makefile 2010-05-27 16:39:24.433440867 +0200 +@@ -2,8 +2,8 @@ + # Makefile for autofs + # + +--include ../Makefile.conf + include ../Makefile.rules ++-include ../Makefile.conf + + SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \ + lookup.c state.c flag.c +@@ -20,7 +20,7 @@ + CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\" + CFLAGS += -DVERSION_STRING=\"$(version)\" + LDFLAGS += -rdynamic +-LIBS = -ldl ++LIBS = -ldl -lpthread + + ifeq ($(LDAP), 1) + ifeq ($(SASL), 1) +@@ -30,8 +30,7 @@ + all: automount + + automount: $(OBJS) $(AUTOFS_LIB) +- $(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) +- $(STRIP) automount ++ $(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) + + clean: + rm -f *.o *.s *~ automount +--- lib/Makefile.old 2010-05-27 17:42:14.424151727 +0200 ++++ lib/Makefile 2010-05-27 17:42:43.629174396 +0200 +@@ -41,14 +41,12 @@ + + mount_clnt.o: mount_clnt.c + $(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c +- $(STRIP) mount_clnt.o + + mount_xdr.c: mount.h + $(RPCGEN) -c -o mount_xdr.c mount.x + + mount_xdr.o: mount_xdr.c + $(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c +- $(STRIP) mount_xdr.o + + master_tok.c: master_tok.l + $(LEX) -o$@ -Pmaster_ $? +--- modules/Makefile.old 2010-05-27 17:42:18.726149315 +0200 ++++ modules/Makefile 2010-05-27 17:43:01.581400805 +0200 +@@ -87,7 +87,6 @@ + lookup_hesiod.so: lookup_hesiod.c + $(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \ + lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV) +- $(STRIP) lookup_hesiod.so + + cyrus-sasl.o: cyrus-sasl.c + $(CC) $(CFLAGS) $(LDAP_FLAGS) -c $< +@@ -96,10 +95,7 @@ + $(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ + lookup_ldap.c dclist.o $(SASL_OBJ) \ + $(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV) +- $(STRIP) lookup_ldap.so + + mount_nfs.so: mount_nfs.c replicated.o + $(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ + mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) +- $(STRIP) mount_nfs.so +- |