diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2013-03-25 13:23:11 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2013-03-25 13:23:11 +0000 |
| commit | d1b93bc241984795a7379819b329903f38d3ae03 (patch) | |
| tree | eb200f17f9b2bc50b46c817e695ec811121fd608 /net-dialup | |
| parent | Bump 2.3 branch for bug #411727 (diff) | |
| download | gentoo-2-d1b93bc241984795a7379819b329903f38d3ae03.tar.gz gentoo-2-d1b93bc241984795a7379819b329903f38d3ae03.tar.bz2 gentoo-2-d1b93bc241984795a7379819b329903f38d3ae03.zip | |
Respect compiler during plugins build, wrt bug #461722. Thanks to Agostino Sarubbo for discovering this issue
(Portage version: 2.2.0_alpha168/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'net-dialup')
| -rw-r--r-- | net-dialup/pptpd/ChangeLog | 7 | ||||
| -rw-r--r-- | net-dialup/pptpd/files/pptpd-1.3.4-gentoo.patch | 3 | ||||
| -rw-r--r-- | net-dialup/pptpd/pptpd-1.3.4-r2.ebuild | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/net-dialup/pptpd/ChangeLog b/net-dialup/pptpd/ChangeLog index cac8bc495829..048a5c4e0d20 100644 --- a/net-dialup/pptpd/ChangeLog +++ b/net-dialup/pptpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-dialup/pptpd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.47 2013/03/14 13:28:05 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/ChangeLog,v 1.48 2013/03/25 13:23:11 pinkbyte Exp $ + + 25 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> pptpd-1.3.4-r2.ebuild, + files/pptpd-1.3.4-gentoo.patch: + Respect compiler during plugins build, wrt bug #461722. Thanks to Agostino + Sarubbo for discovering this issue 14 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> -pptpd-1.3.4.ebuild, -pptpd-1.3.4-r1.ebuild, -files/pptpd-init, -files/pptpd-init-r1: diff --git a/net-dialup/pptpd/files/pptpd-1.3.4-gentoo.patch b/net-dialup/pptpd/files/pptpd-1.3.4-gentoo.patch index 36ebea76ecae..9d5e245b7295 100644 --- a/net-dialup/pptpd/files/pptpd-1.3.4-gentoo.patch +++ b/net-dialup/pptpd/files/pptpd-1.3.4-gentoo.patch @@ -14,7 +14,8 @@ diff -Naur pptpd-1.3.4.orig/plugins/Makefile pptpd-1.3.4/plugins/Makefile --- pptpd-1.3.4.orig/plugins/Makefile 2006-08-03 06:02:01.000000000 +0400 +++ pptpd-1.3.4/plugins/Makefile 2007-05-01 21:29:15.000000000 +0400 @@ -1,6 +1,5 @@ - CC = gcc +-CC = gcc ++CC ?= gcc -COPTS = -O2 -g -CFLAGS = $(COPTS) -I.. -I../../include -fPIC +CFLAGS += -I.. -I../../include -fPIC diff --git a/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild b/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild index e276b0fac503..c9053f4192fc 100644 --- a/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild +++ b/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild,v 1.3 2013/03/14 13:24:32 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild,v 1.4 2013/03/25 13:23:11 pinkbyte Exp $ EAPI="5" @@ -30,6 +30,9 @@ src_prepare() { sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" plugins/patchlevel.h || die sed -i -e "/^LDFLAGS/{s:=:+=:}" plugins/Makefile || die + # respect compiler, bug #461722 + tc-export CC + eautoreconf } |