diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2012-11-04 21:51:59 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2012-11-04 21:51:59 +0000 |
| commit | 93e4227ba0e8407939147ae5e93bf3ff7f6982af (patch) | |
| tree | 5ddc4927b91c53fd7a95c3fbdc383c213457ab46 /app-misc | |
| parent | Version bump wrt bug 409987. Fix LDFLAGS respect. EAPI bump. (diff) | |
| download | gentoo-2-93e4227ba0e8407939147ae5e93bf3ff7f6982af.tar.gz gentoo-2-93e4227ba0e8407939147ae5e93bf3ff7f6982af.tar.bz2 gentoo-2-93e4227ba0e8407939147ae5e93bf3ff7f6982af.zip | |
Support CPPFLAGS for bug #424557.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x64D4CF24)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/screen/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/screen/files/screen-4.0.3-cppflags.patch | 11 | ||||
| -rw-r--r-- | app-misc/screen/screen-4.0.3-r5.ebuild | 11 |
3 files changed, 23 insertions, 5 deletions
diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog index 91d8493c2df8..21a0d70d81b1 100644 --- a/app-misc/screen/ChangeLog +++ b/app-misc/screen/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/screen # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.173 2012/07/10 19:19:37 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.174 2012/11/04 21:51:59 swegener Exp $ + + 04 Nov 2012; Sven Wegener <swegener@gentoo.org> screen-4.0.3-r5.ebuild, + +files/screen-4.0.3-cppflags.patch: + Support CPPFLAGS for bug #424557. 10 Jul 2012; Justin Lecher <jlec@gentoo.org> -screen-4.0.3-r4.ebuild, metadata.xml: diff --git a/app-misc/screen/files/screen-4.0.3-cppflags.patch b/app-misc/screen/files/screen-4.0.3-cppflags.patch new file mode 100644 index 000000000000..aebf35119c6e --- /dev/null +++ b/app-misc/screen/files/screen-4.0.3-cppflags.patch @@ -0,0 +1,11 @@ +--- screen-4.0.3/Makefile.in ++++ screen-4.0.3/Makefile.in +@@ -68,7 +68,7 @@ + $(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) + + .c.o: +- $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< ++ $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CPPFLAGS) $(CFLAGS) $< + + install_bin: .version screen + -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ diff --git a/app-misc/screen/screen-4.0.3-r5.ebuild b/app-misc/screen/screen-4.0.3-r5.ebuild index 8d9225874bda..d78dcf176d08 100644 --- a/app-misc/screen/screen-4.0.3-r5.ebuild +++ b/app-misc/screen/screen-4.0.3-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r5.ebuild,v 1.9 2012/07/10 19:12:22 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r5.ebuild,v 1.10 2012/11/04 21:51:59 swegener Exp $ EAPI=4 @@ -89,17 +89,20 @@ src_prepare() { # Allow usernames up to 32 chars epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch + # support CPPFLAGS + epatch "${FILESDIR}"/${P}-cppflags.patch + # reconfigure eautoconf } src_configure() { - append-flags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" + append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl - use nethack || append-flags "-DNONETHACK" - use debug && append-flags "-DDEBUG" + use nethack || append-cppflags "-DNONETHACK" + use debug && append-cppflags "-DDEBUG" econf \ --with-socket-dir="${EPREFIX}/var/run/screen" \ |