From 56fea3840a0b3a031c10bcc73b5a3ee56c5ffa6e Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Mon, 14 Apr 2008 12:09:03 +0000 Subject: Respect CFLAGS and LDFLAGS. Package-Manager: portage-2.1.5_rc3 --- dev-util/csup/ChangeLog | 8 +++- dev-util/csup/Manifest | 15 +++++++- dev-util/csup/csup-20060318.ebuild | 17 +++++++-- .../csup/files/csup-20060318-respectflags.patch | 43 ++++++++++++++++++++++ 4 files changed, 76 insertions(+), 7 deletions(-) create mode 100644 dev-util/csup/files/csup-20060318-respectflags.patch (limited to 'dev-util/csup') diff --git a/dev-util/csup/ChangeLog b/dev-util/csup/ChangeLog index 2bf5500bf9c8..4b83354af137 100644 --- a/dev-util/csup/ChangeLog +++ b/dev-util/csup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/csup -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/csup/ChangeLog,v 1.5 2006/11/03 08:36:16 drizzt Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/csup/ChangeLog,v 1.6 2008/04/14 12:09:03 flameeyes Exp $ + + 14 Apr 2008; Diego Pettenò + +files/csup-20060318-respectflags.patch, csup-20060318.ebuild: + Respect CFLAGS and LDFLAGS. 03 Nov 2006; Timothy Redaelli csup-20060318.ebuild: Added ~ppc keyword. diff --git a/dev-util/csup/Manifest b/dev-util/csup/Manifest index c2fd2bc9b710..b29d1ffd3484 100644 --- a/dev-util/csup/Manifest +++ b/dev-util/csup/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX csup-20060318-respectflags.patch 1374 RMD160 8eb19f7d38ddf001b93f0f3c440931ccbc4ca0ec SHA1 9385120537ed902a0d2620607a1927e5b13c3d5e SHA256 abae4744ccd06a4ad312c2bd359dcdb8299c2bbc091c8d1097613616631ca320 DIST csup-snap-20060318.tgz 78968 RMD160 57009b0bdb4c8af9bd534429486982cceadbb066 SHA1 209c53137245e3e5e2cea98151115043d993ce35 SHA256 81a9695be6cf989de6fb2e4fe53d6efadb003cd842cf6993844a52fc8190a7fc -EBUILD csup-20060318.ebuild 979 RMD160 d81986e2ea4bac50e748d6385deed5bf07f46cb8 SHA1 40a285229dc6f5c737746717f7a370bfd6ea82e4 SHA256 50bbb6b6384210161eb0ebd4bfbd83fb01249bf271046a244afc4260d05d25f9 -MISC ChangeLog 944 RMD160 cb78d7bed9bd3fd70898472dad56997d8591011e SHA1 d0cef6d15d3fe5f4712d890f3ca860bdbfb46cc0 SHA256 20904e20da2a4c6fb42d082357441f31fdfb453383dac984ef256707a00a642e +EBUILD csup-20060318.ebuild 1128 RMD160 ab41b94a8021f6630d041d348ce1876ed34cd15f SHA1 d9e10fdb3b52147577aa15a481c1657d04bc36d6 SHA256 2b5aa3e87475f88a6c8f5a24712d56723af460ce28e4668fc3696d62686098ff +MISC ChangeLog 1096 RMD160 2d0b2409263a9eca78aef337b0778908a422a8c4 SHA1 fb3fca4ea3e8762a3ab84a868aac6103c270b92d SHA256 86c318bf6a3899715798d2f245156bf750ae9a7b42c6c2653e3ad81111c3b291 MISC metadata.xml 157 RMD160 967f9b3fddf409be08620ee390863ae8a44ea2fb SHA1 fd33a22d95ca46b8ea8f27be48d0b0f10914a638 SHA256 1dd5589fe62f08037ccf5e6a3c90d449e4e4766b50aeaad316de5de17ae6b86b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkgDSWUACgkQAiZjviIA2Xit1gCg433eA3jl3/c4oR5cDf7sbBQm +nsUAoOHq098L4YSeXI74HhkKhNsmGcZ4 +=B4Pe +-----END PGP SIGNATURE----- diff --git a/dev-util/csup/csup-20060318.ebuild b/dev-util/csup/csup-20060318.ebuild index 11972e39c36f..147502adfc13 100644 --- a/dev-util/csup/csup-20060318.ebuild +++ b/dev-util/csup/csup-20060318.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/csup/csup-20060318.ebuild,v 1.5 2006/11/03 08:36:16 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/csup/csup-20060318.ebuild,v 1.6 2008/04/14 12:09:03 flameeyes Exp $ + +inherit toolchain-funcs eutils DESCRIPTION="C-based rewrite of CVSup (software for distributing and updating collections of files accross a network)" HOMEPAGE="http://www.mu.org/~mux/csup.html" @@ -22,9 +24,18 @@ DEPEND="${DEPEND} S="${WORKDIR}/${PN}" +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-respectflags.patch" +} + src_compile() { # unable to work with yacc, but bison is ok. - emake PREFIX=/usr YACC=bison || die "emake failed" + emake \ + CC="$(tc-getCC)" \ + PREFIX=/usr YACC=bison || die "emake failed" } src_install() { diff --git a/dev-util/csup/files/csup-20060318-respectflags.patch b/dev-util/csup/files/csup-20060318-respectflags.patch new file mode 100644 index 000000000000..c95a974c75ed --- /dev/null +++ b/dev-util/csup/files/csup-20060318-respectflags.patch @@ -0,0 +1,43 @@ +Index: csup/GNUmakefile +=================================================================== +--- csup.orig/GNUmakefile ++++ csup/GNUmakefile +@@ -21,7 +21,7 @@ WARNS= -Wall -W -Wno-unused-parameter -W + -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline \ + -Wnested-externs -Wredundant-decls -Wno-format-y2k + +-CFLAGS+= -g -O -pipe -DNDEBUG -I$(PREFIX)/include ++CFLAGS+= -I$(PREFIX)/include + ifeq ($(UNAME), Linux) + CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + endif +@@ -29,14 +29,14 @@ ifeq ($(UNAME), Darwin) + CFLAGS+= -DHAVE_FFLAGS + endif + CFLAGS+= $(WARNS) +-LDFLAGS= -L$(PREFIX)/lib -lcrypto -lz -lpthread ++LIBS= -L$(PREFIX)/lib -lcrypto -lz -lpthread + + .PHONY: all clean install + + all: csup csup.1.gz + + csup: $(OBJS) +- $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) + + config.c: parse.h + +Index: csup/Makefile +=================================================================== +--- csup.orig/Makefile ++++ csup/Makefile +@@ -11,7 +11,7 @@ SRCS= attrstack.c config.c detailer.c di + globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \ + pathcomp.c proto.c status.c stream.c threads.c token.l updater.c + +-CFLAGS+= -I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG ++CFLAGS+= -I. -I${.CURDIR} -pthread -DHAVE_FFLAGS + WARNS?= 6 + + # A bit of tweaking is needed to get this Makefile working -- cgit v1.2.3-65-gdbad