diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-06-09 01:36:47 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-06-09 01:36:47 +0000 |
| commit | 546f6a8d5cc81f586c6574b6fff8e32970301d59 (patch) | |
| tree | 142036bb06008cebb8b4d294d79aa61bdfa37bed /sys-apps/watchdog/files | |
| parent | media-video/cheese: Fix conclict with sys-fs/udev-171 (bug ##370381) (diff) | |
| download | gentoo-2-546f6a8d5cc81f586c6574b6fff8e32970301d59.tar.gz gentoo-2-546f6a8d5cc81f586c6574b6fff8e32970301d59.tar.bz2 gentoo-2-546f6a8d5cc81f586c6574b6fff8e32970301d59.zip | |
Control nfs support via USE=nfs to fix building with glibc-2.14 #370655 by Diego Elio Pettenò.
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/watchdog/files')
| -rw-r--r-- | sys-apps/watchdog/files/watchdog-5.9-nfs.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/sys-apps/watchdog/files/watchdog-5.9-nfs.patch b/sys-apps/watchdog/files/watchdog-5.9-nfs.patch new file mode 100644 index 000000000000..cf670f7d3b47 --- /dev/null +++ b/sys-apps/watchdog/files/watchdog-5.9-nfs.patch @@ -0,0 +1,78 @@ +https://sourceforge.net/tracker/?func=detail&aid=3314009&group_id=172030&atid=860196 +http://bugs.gentoo.org/370655 + +--- src/nfsmount_clnt.c ++++ src/nfsmount_clnt.c +@@ -3,6 +3,9 @@ + * It was generated using rpcgen. + */ + ++#include "config.h" ++#if HAVE_NFS ++ + #include "nfsmount.h" + /* + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for +@@ -279,3 +282,5 @@ + } + return (&clnt_res); + } ++ ++#endif +--- src/nfsmount.c ++++ src/nfsmount.c +@@ -34,6 +34,10 @@ + * nfsmount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp + */ + ++#include "config.h" ++ ++#if HAVE_NFS ++ + #include <unistd.h> + #include <stdio.h> + #include <string.h> +@@ -865,3 +869,5 @@ + return port; + } + #endif ++ ++#endif +--- src/nfsmount_xdr.c ++++ src/nfsmount_xdr.c +@@ -3,6 +3,9 @@ + * It was generated using rpcgen. + */ + ++#include "config.h" ++#if HAVE_NFS ++ + #include "nfsmount.h" + /* + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for +@@ -300,3 +303,5 @@ + return FALSE; + return TRUE; + } ++ ++#endif +--- src/shutdown.c ++++ src/shutdown.c +@@ -24,7 +24,6 @@ + #include <sys/types.h> + #include <unistd.h> + #include <time.h> +-#include <rpc/types.h> /* for caddr_t */ + + #include "watch_err.h" + #include "extern.h" +--- src/sundries.c ++++ src/sundries.c +@@ -12,7 +12,6 @@ + #include <mntent.h> /* for MNTTYPE_SWAP */ + #include "fstab.h" + #include "sundries.h" +-#include "nfsmount.h" + + + /* String list constructor. (car() and cdr() are defined in "sundries.h"). */ |