diff options
Diffstat (limited to 'net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch')
| -rw-r--r-- | net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch | 166 |
1 files changed, 0 insertions, 166 deletions
diff --git a/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch b/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch deleted file mode 100644 index f49b4aa..0000000 --- a/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch +++ /dev/null @@ -1,166 +0,0 @@ -=== modified file 'Makefile.conf.in' ---- Makefile.conf.in 2011-04-02 14:53:02 +0000 -+++ Makefile.conf.in 2011-04-02 14:53:26 +0000 -@@ -95,3 +95,5 @@ - # Location for init.d files - initdir = @initdir@ - -+# Use the compiler determined by configure -+CC := @CC@ - -=== modified file 'Makefile.rules' ---- Makefile.rules 2011-04-02 14:53:02 +0000 -+++ Makefile.rules 2011-04-02 14:54:11 +0000 -@@ -16,44 +16,30 @@ - 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 - - 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 -+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 -@@ -67,5 +53,4 @@ - $(CC) $(CFLAGS) -S $< - - .c.so: -- $(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL) -- $(STRIP) $*.so -+ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL) - -=== modified file 'configure.in' ---- configure.in 2011-04-02 14:53:02 +0000 -+++ configure.in 2011-04-02 14:53:26 +0000 -@@ -174,7 +174,7 @@ - : 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 - -=== modified file 'daemon/Makefile' ---- daemon/Makefile 2011-04-02 14:53:02 +0000 -+++ daemon/Makefile 2011-04-02 14:53:26 +0000 -@@ -2,8 +2,8 @@ - # Makefile for autofs - # - -+include ../Makefile.rules - -include ../Makefile.conf --include ../Makefile.rules - - 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) - CFLAGS += $(XML_FLAGS) -@@ -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 - -=== modified file 'lib/Makefile' ---- lib/Makefile 2011-04-02 14:53:02 +0000 -+++ lib/Makefile 2011-04-02 14:53:26 +0000 -@@ -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_ $? - -=== modified file 'modules/Makefile' ---- modules/Makefile 2011-04-02 14:53:02 +0000 -+++ modules/Makefile 2011-04-02 14:55:06 +0000 -@@ -85,9 +85,8 @@ - # Ad hoc compilation rules for modules which need auxilliary libraries - # - lookup_hesiod.so: lookup_hesiod.c -- $(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \ -+ $(CC) $(LDFLAGS) $(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,13 +95,10 @@ - $(CC) $(CFLAGS) $(LDAP_FLAGS) -c $< - - lookup_ldap.so: lookup_ldap.c dclist.o $(SASL_OBJ) -- $(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ -+ $(CC) $(LDFLAGS) $(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 \ -+ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ - mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) -- $(STRIP) mount_nfs.so -- - |