| 1 |
pva 11/06/28 14:06:07 |
| 2 |
|
| 3 |
Added: |
| 4 |
autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch |
| 5 |
Log: |
| 6 |
Version bump, bug #373339 thank Dustin Polke for this job. |
| 7 |
|
| 8 |
(Portage version: 2.1.10.3/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch |
| 17 |
=================================================================== |
| 18 |
--- Makefile.conf.in |
| 19 |
+++ Makefile.conf.in |
| 20 |
@@ -95,3 +95,5 @@ |
| 21 |
# Location for init.d files |
| 22 |
initdir = @initdir@ |
| 23 |
|
| 24 |
+# Use the compiler determined by configure |
| 25 |
+CC := @CC@ |
| 26 |
|
| 27 |
--- Makefile.rules |
| 28 |
+++ Makefile.rules |
| 29 |
@@ -16,44 +16,30 @@ |
| 30 |
AUTOFS_LIB = ../lib/autofs.a |
| 31 |
|
| 32 |
# Compilers, linkers and flags |
| 33 |
-# The STRIP defined here *must not* remove any dynamic-loading symbols |
| 34 |
- |
| 35 |
ifdef DMALLOCLIB |
| 36 |
DEBUG=1 |
| 37 |
endif |
| 38 |
|
| 39 |
ifdef DEBUG |
| 40 |
CFLAGS ?= -g -Wall -DDEBUG |
| 41 |
-LDFLAGS = -g |
| 42 |
-STRIP = : |
| 43 |
else |
| 44 |
-ifdef DONTSTRIP |
| 45 |
CFLAGS ?= -O2 -g |
| 46 |
-LDFLAGS = -g |
| 47 |
-STRIP = : |
| 48 |
-else |
| 49 |
-CFLAGS ?= -O2 -Wall |
| 50 |
-LDFLAGS = -s |
| 51 |
-STRIP = strip --strip-debug |
| 52 |
-endif |
| 53 |
-endif |
| 54 |
+endif |
| 55 |
+AUTOFS_LDFLAGS = -g |
| 56 |
|
| 57 |
-CC = gcc |
| 58 |
-CXX = g++ |
| 59 |
CXXFLAGS = $(CFLAGS) |
| 60 |
LD = ld |
| 61 |
SOLDFLAGS = -shared |
| 62 |
|
| 63 |
CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 |
| 64 |
-LDFLAGS += -lpthread |
| 65 |
|
| 66 |
ifdef TIRPCLIB |
| 67 |
CFLAGS += -I/usr/include/tirpc |
| 68 |
-LDFLAGS += $(TIRPCLIB) |
| 69 |
+AUTOFS_LDFLAGS += $(TIRPCLIB) |
| 70 |
endif |
| 71 |
|
| 72 |
ifdef DMALLOCLIB |
| 73 |
-LDFLAGS += $(DMALLOCLIB) |
| 74 |
+AUTOFS_LDFLAGS += $(DMALLOCLIB) |
| 75 |
endif |
| 76 |
|
| 77 |
# Standard rules |
| 78 |
@@ -67,5 +53,4 @@ |
| 79 |
$(CC) $(CFLAGS) -S $< |
| 80 |
|
| 81 |
.c.so: |
| 82 |
- $(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL) |
| 83 |
- $(STRIP) $*.so |
| 84 |
+ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL) |
| 85 |
|
| 86 |
--- configure.in |
| 87 |
+++ configure.in |
| 88 |
@@ -174,7 +174,7 @@ |
| 89 |
: Search for Hesiod in normal directory path |
| 90 |
else |
| 91 |
: Search for Hesiod in specific directory |
| 92 |
- LDFLAGS="$LDFLAGS -L${withval}/lib" |
| 93 |
+ LDFLAGS="$LDFLAGS -Wl,--no-as-needed -L${withval}/lib" |
| 94 |
LIBHESIOD="-L${withval}/lib" |
| 95 |
HESIOD_FLAGS="-I${withval}/include" |
| 96 |
fi |
| 97 |
|
| 98 |
--- daemon/Makefile |
| 99 |
+++ daemon/Makefile |
| 100 |
@@ -2,8 +2,8 @@ |
| 101 |
# Makefile for autofs |
| 102 |
# |
| 103 |
|
| 104 |
+include ../Makefile.rules |
| 105 |
-include ../Makefile.conf |
| 106 |
-include ../Makefile.rules |
| 107 |
|
| 108 |
SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \ |
| 109 |
lookup.c state.c flag.c |
| 110 |
@@ -20,7 +20,7 @@ |
| 111 |
CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\" |
| 112 |
CFLAGS += -DVERSION_STRING=\"$(version)\" |
| 113 |
LDFLAGS += -rdynamic |
| 114 |
-LIBS = -ldl |
| 115 |
+LIBS = -ldl -lpthread |
| 116 |
|
| 117 |
ifeq ($(LDAP), 1) |
| 118 |
CFLAGS += $(XML_FLAGS) |
| 119 |
@@ -30,8 +30,7 @@ |
| 120 |
all: automount |
| 121 |
|
| 122 |
automount: $(OBJS) $(AUTOFS_LIB) |
| 123 |
- $(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) |
| 124 |
- $(STRIP) automount |
| 125 |
+ $(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) |
| 126 |
|
| 127 |
clean: |
| 128 |
rm -f *.o *.s *~ automount |
| 129 |
|
| 130 |
--- lib/Makefile |
| 131 |
+++ lib/Makefile |
| 132 |
@@ -41,14 +41,12 @@ |
| 133 |
|
| 134 |
mount_clnt.o: mount_clnt.c |
| 135 |
$(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c |
| 136 |
- $(STRIP) mount_clnt.o |
| 137 |
|
| 138 |
mount_xdr.c: mount.h |
| 139 |
$(RPCGEN) -c -o mount_xdr.c mount.x |
| 140 |
|
| 141 |
mount_xdr.o: mount_xdr.c |
| 142 |
$(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c |
| 143 |
- $(STRIP) mount_xdr.o |
| 144 |
|
| 145 |
master_tok.c: master_tok.l |
| 146 |
$(LEX) -o$@ -Pmaster_ $? |
| 147 |
|
| 148 |
--- modules/Makefile |
| 149 |
+++ modules/Makefile |
| 150 |
@@ -85,9 +85,8 @@ |
| 151 |
# Ad hoc compilation rules for modules which need auxilliary libraries |
| 152 |
# |
| 153 |
lookup_hesiod.so: lookup_hesiod.c |
| 154 |
- $(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \ |
| 155 |
+ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \ |
| 156 |
lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV) |
| 157 |
- $(STRIP) lookup_hesiod.so |
| 158 |
|
| 159 |
cyrus-sasl.o: cyrus-sasl.c |
| 160 |
$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $< |
| 161 |
@@ -96,13 +95,10 @@ |
| 162 |
$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $< |
| 163 |
|
| 164 |
lookup_ldap.so: lookup_ldap.c dclist.o base64.o $(SASL_OBJ) |
| 165 |
- $(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ |
| 166 |
+ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ |
| 167 |
lookup_ldap.c dclist.o base64.o $(SASL_OBJ) \ |
| 168 |
$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV) |
| 169 |
- $(STRIP) lookup_ldap.so |
| 170 |
|
| 171 |
mount_nfs.so: mount_nfs.c replicated.o |
| 172 |
- $(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ |
| 173 |
+ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ |
| 174 |
mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) |
| 175 |
- $(STRIP) mount_nfs.so |
| 176 |
- |
Archives