diff options
| author |   Ned Ludd <solar@gentoo.org> | 2009-03-28 05:39:33 +0000 |
|---|---|---|
| committer | Ned Ludd <solar@gentoo.org> | 2009-03-28 05:39:33 +0000 |
| commit | 3adae65f18e75da695bf3cd17c8b4378fd7d452a (patch) | |
| tree | 1ce0522a14f16bf5949a64fcb1a65c3170f2df08 /app-misc/beep | |
| parent | p.mask sys-apps/sreadahead due to possible bad patches (diff) | |
| download | gentoo-2-3adae65f18e75da695bf3cd17c8b4378fd7d452a.tar.gz gentoo-2-3adae65f18e75da695bf3cd17c8b4378fd7d452a.tar.bz2 gentoo-2-3adae65f18e75da695bf3cd17c8b4378fd7d452a.zip | |
- make beep respect LDFLAGS via basic Makefile cleanups
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/beep')
| -rw-r--r-- | app-misc/beep/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/beep/beep-1.2.2-r1.ebuild | 15 | ||||
| -rw-r--r-- | app-misc/beep/files/beep-1.2.2-Makefile.patch | 26 |
3 files changed, 37 insertions, 12 deletions
diff --git a/app-misc/beep/ChangeLog b/app-misc/beep/ChangeLog index 0800fb4b5944..f4c581b43c70 100644 --- a/app-misc/beep/ChangeLog +++ b/app-misc/beep/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/beep -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/ChangeLog,v 1.25 2008/05/10 23:18:43 solar Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/ChangeLog,v 1.26 2009/03/28 05:39:33 solar Exp $ + + 28 Mar 2009; <solar@gentoo.org> +files/beep-1.2.2-Makefile.patch, + beep-1.2.2-r1.ebuild: + - make beep respect LDFLAGS via basic Makefile cleanups 10 May 2008; <solar@gentoo.org> beep-1.2.2-r1.ebuild: - cross compile fix and keyworded for ~arm diff --git a/app-misc/beep/beep-1.2.2-r1.ebuild b/app-misc/beep/beep-1.2.2-r1.ebuild index e83f22287276..ab1a07215997 100644 --- a/app-misc/beep/beep-1.2.2-r1.ebuild +++ b/app-misc/beep/beep-1.2.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/beep-1.2.2-r1.ebuild,v 1.11 2008/10/27 05:48:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/beep-1.2.2-r1.ebuild,v 1.12 2009/03/28 05:39:33 solar Exp $ inherit eutils base toolchain-funcs @@ -13,15 +13,10 @@ SLOT="0" KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86" IUSE="" -PATCHES="${FILESDIR}/${P}-nosuid.patch" +PATCHES=( ${FILESDIR}/${P}-{Makefile,nosuid}.patch ) -src_unpack() { - unpack ${A} - cd "${S}" - sed -i -e 's/CC=gcc/CC?=gcc/' Makefile || ewarn "Have I been fixed?" -} -src_compile() { - emake CC=$(tc-getCC) FLAGS="${CFLAGS}" || die "compile problem" +pkg_setup() { + tc-export CC } src_install() { diff --git a/app-misc/beep/files/beep-1.2.2-Makefile.patch b/app-misc/beep/files/beep-1.2.2-Makefile.patch new file mode 100644 index 000000000000..6497323b9235 --- /dev/null +++ b/app-misc/beep/files/beep-1.2.2-Makefile.patch @@ -0,0 +1,26 @@ +--- /var/tmp/portage/app-misc/beep-1.2.2-r1/work/beep-1.2.2/Makefile 2002-03-29 09:37:22.000000000 -0800 ++++ /tmp/Makefile 2009-03-27 22:19:18.000000000 -0700 +@@ -1,17 +1,18 @@ +-CC=gcc +-FLAGS=-Wall ++CC ?= gcc ++LDFLAGS ?= ++CFLAGS ?= -Wall + EXEC_NAME=beep + INSTALL_DIR=/usr/bin + MAN_FILE=beep.1.gz +-MAN_DIR=/usr/man/man1 ++MAN_DIR=/usr/share/man/man1 + + default : beep + + clean : +- rm ${EXEC_NAME} ++ rm -f ${EXEC_NAME} + + beep : beep.c +- ${CC} ${FLAGS} -o ${EXEC_NAME} beep.c ++ ${CC} ${CFLAGS} ${LDFLAGS} -o ${EXEC_NAME} beep.c + + install : + cp ${EXEC_NAME} ${INSTALL_DIR} |