diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2007-01-04 22:23:56 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2007-01-04 22:23:56 +0000 |
| commit | a229ea610ff4c68a26bb45fe610bf3e65804c11e (patch) | |
| tree | 8c09677d4d4ec2f62d0a57e7c81261c127c36bd7 /net-dialup/rp-pppoe/files | |
| parent | Drop USE=debug since it is no longer supported in the source code. (diff) | |
| download | gentoo-2-a229ea610ff4c68a26bb45fe610bf3e65804c11e.tar.gz gentoo-2-a229ea610ff4c68a26bb45fe610bf3e65804c11e.tar.bz2 gentoo-2-a229ea610ff4c68a26bb45fe610bf3e65804c11e.zip | |
Fix broken compilation on glibc-2.5 , second try (bug #159896 comment #19)
(Portage version: 2.1.1-r2)
Diffstat (limited to 'net-dialup/rp-pppoe/files')
| -rw-r--r-- | net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch new file mode 100644 index 000000000000..40f6f08c9138 --- /dev/null +++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch @@ -0,0 +1,70 @@ +diff -Nru rp-pppoe-3.8.orig/gui/Makefile.in rp-pppoe-3.8/gui/Makefile.in +--- rp-pppoe-3.8.orig/gui/Makefile.in 2006-09-23 18:05:31.000000000 +0300 ++++ rp-pppoe-3.8/gui/Makefile.in 2006-09-23 18:16:02.623018000 +0300 +@@ -46,7 +46,7 @@ + -mkdir -p $(RPM_INSTALL_ROOT)$(sbindir) + -mkdir -p $(RPM_INSTALL_ROOT)$(bindir) + -mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp/rp-pppoe-gui +- $(install) -m 4755 -s pppoe-wrapper $(RPM_INSTALL_ROOT)$(sbindir) ++ $(install) -m 4755 pppoe-wrapper $(RPM_INSTALL_ROOT)$(sbindir) + $(install) -m 755 tkpppoe $(RPM_INSTALL_ROOT)$(bindir) + -mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man1 + $(install) -m 644 pppoe-wrapper.1 $(RPM_INSTALL_ROOT)$(mandir)/man1 +diff -Nru rp-pppoe-3.8.orig/src/configure.in rp-pppoe-3.8/src/configure.in +--- rp-pppoe-3.8.orig/src/configure.in 2006-04-02 17:29:42.000000000 +0300 ++++ rp-pppoe-3.8/src/configure.in 2007-01-05 00:12:48.000000000 +0200 +@@ -145,15 +145,15 @@ + AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support) + AC_CACHE_VAL(ac_cv_linux_kernel_pppoe,[ + if test "`uname -s`" = "Linux" ; then +-if test $cross_compiling = "no"; then ++dnl if test $cross_compiling = "no"; then + + dnl Do a bunch of modprobes. Can't hurt; might help. +-modprobe ppp_generic > /dev/null 2>&1 +-modprobe ppp_async > /dev/null 2>&1 +-modprobe n_hdlc > /dev/null 2>&1 +-modprobe ppp_synctty > /dev/null 2>&1 +-modprobe pppoe > /dev/null 2>&1 +-fi ++dnl modprobe ppp_generic > /dev/null 2>&1 ++dnl modprobe ppp_async > /dev/null 2>&1 ++dnl modprobe n_hdlc > /dev/null 2>&1 ++dnl modprobe ppp_synctty > /dev/null 2>&1 ++dnl modprobe pppoe > /dev/null 2>&1 ++dnl fi + AC_TRY_RUN([#include <sys/socket.h> + #include <net/ethernet.h> + #include <linux/if.h> +@@ -180,7 +180,7 @@ + + dnl GCC warning level + if test "$GCC" = yes; then +- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -ansi" ++ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -D_GNU_SOURCE" + fi + + dnl If we couldn't find pppd, die +diff -Nru rp-pppoe-3.8.orig/src/plugin.c rp-pppoe-3.8/src/plugin.c +--- rp-pppoe-3.8.orig/src/plugin.c 2006-04-02 17:29:42.000000000 +0300 ++++ rp-pppoe-3.8/src/plugin.c 2007-01-05 00:08:41.000000000 +0200 +@@ -27,7 +27,6 @@ + static char const RCSID[] = + "$Id: rp-pppoe-3.8-configure.patch,v 1.1 2007/01/04 22:23:56 mrness Exp $"; + +-#define _GNU_SOURCE 1 + #include "pppoe.h" + + #include "pppd/pppd.h" +diff -Nru rp-pppoe-3.8.orig/src/relay.c rp-pppoe-3.8/src/relay.c +--- rp-pppoe-3.8.orig/src/relay.c 2006-04-02 17:29:42.000000000 +0300 ++++ rp-pppoe-3.8/src/relay.c 2007-01-05 00:08:46.000000000 +0200 +@@ -17,8 +17,6 @@ + static char const RCSID[] = + "$Id: rp-pppoe-3.8-configure.patch,v 1.1 2007/01/04 22:23:56 mrness Exp $"; + +-#define _GNU_SOURCE 1 /* For SA_RESTART */ +- + #include "relay.h" + + #include <signal.h> |