diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-08-13 12:46:30 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-08-13 12:46:30 +0000 |
| commit | 1fc153eda5ddb71e565c7cc4de0ae8f54c07f6be (patch) | |
| tree | de5d6ae071354b130c47c5e5dd5424def72ad9ab /app-misc | |
| parent | Marked ppc stable for bug #325825. (diff) | |
| download | gentoo-2-1fc153eda5ddb71e565c7cc4de0ae8f54c07f6be.tar.gz gentoo-2-1fc153eda5ddb71e565c7cc4de0ae8f54c07f6be.tar.bz2 gentoo-2-1fc153eda5ddb71e565c7cc4de0ae8f54c07f6be.zip | |
Patch from Dane Smith <smithdanea@gmail.com> to fix LDFLAGS and parallel build issues. Bug #332463
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/glimpse/ChangeLog | 7 | ||||
| -rw-r--r-- | app-misc/glimpse/files/glimpse-4.18.5-makefile.patch | 42 | ||||
| -rw-r--r-- | app-misc/glimpse/glimpse-4.18.5.ebuild | 14 |
3 files changed, 58 insertions, 5 deletions
diff --git a/app-misc/glimpse/ChangeLog b/app-misc/glimpse/ChangeLog index 00f9967e48a6..cacb83711a5f 100644 --- a/app-misc/glimpse/ChangeLog +++ b/app-misc/glimpse/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/glimpse # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/ChangeLog,v 1.31 2010/01/01 21:17:05 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/ChangeLog,v 1.32 2010/08/13 12:46:30 hwoarang Exp $ + + 13 Aug 2010; Markos Chandras <hwoarang@gentoo.org> glimpse-4.18.5.ebuild, + +files/glimpse-4.18.5-makefile.patch: + Patch from Dane Smith <smithdanea@gmail.com> to fix LDFLAGS and parallel + build issues. Bug #332463 01 Jan 2010; Christian Faulhammer <fauli@gentoo.org> glimpse-4.18.5.ebuild: diff --git a/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch b/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch new file mode 100644 index 000000000000..86064099adf2 --- /dev/null +++ b/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch @@ -0,0 +1,42 @@ +--- Makefile.in 2006-03-10 20:42:12.000000000 -0500 ++++ Makefile.in.new 2010-08-12 21:12:41.000000000 -0400 +@@ -52,7 +52,7 @@ + PROGAGREP = agrep/agrep + OPTIMIZEFLAGS = -O2 + INCLUDEFLAGS = -I$(INDEXDIR) -I$(AGREPDIR) -I$(TEMPLATEDIR)/include +-CFLAGS = $(INCLUDEFLAGS) $(DEFS) ++CFLAGS = $(INCLUDEFLAGS) $(DEFS) $(OPTIMIZEFLAGS) + + OBJS = get_filename.o \ + get_index.o \ +@@ -78,7 +78,7 @@ + $(INDEXDIR)/memlook.c \ + $(INDEXDIR)/io.c + +-all: build-sub @TARGET@ ++all: build-sub + Sall: $(PROG) $(PROGSERVER) $(PROGINDEX) + agrep: $(PROGAGREP) + NOTSall: $(NOTSPROG) $(NOTSPROGSERVER) +@@ -87,6 +87,7 @@ + for d in $(SUBDIRS) ; do \ + ( cd $$d; $(MAKE) ); \ + done ++ $(MAKE) @TARGET@ + + # Check target + +@@ -105,11 +106,11 @@ + + install-man: + for d in $(MANUAL) ; do \ +- $(INSTALL_MAN) $$d $(mandir) ; \ ++ $(INSTALL_MAN) $$d $(mandir)/man1/ ; \ + done + + installdirs: mkinstalldirs +- $(srcdir)/mkinstalldirs $(bindir) $(mandir) ++ $(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1/ + + clean: + for d in $(SUBDIRS); do \ diff --git a/app-misc/glimpse/glimpse-4.18.5.ebuild b/app-misc/glimpse/glimpse-4.18.5.ebuild index 8fde84feadcb..8ce99c43d84d 100644 --- a/app-misc/glimpse/glimpse-4.18.5.ebuild +++ b/app-misc/glimpse/glimpse-4.18.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.18.5.ebuild,v 1.13 2010/01/01 21:17:05 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.18.5.ebuild,v 1.14 2010/08/13 12:46:30 hwoarang Exp $ inherit flag-o-matic eutils @@ -27,20 +27,26 @@ src_unpack() { sed -i \ -e '/^CFLAGS/s:$: $(OPTIMIZEFLAGS):' \ {agrep,compress,index}/Makefile.in \ - Makefile.in \ libtemplate/{template,util}/Makefile.in \ || die "inserting OPTIMIZEFLAGS failed" sed -i \ -e 's:$(mandir):&/man1/:' \ - Makefile.in agrep/Makefile.in \ + agrep/Makefile.in \ || die "adding man1 to man install dir failed" + + sed -i \ + -e '/^LDFLAGS/d' \ + {agrep,compress,index}/Makefile.in \ + || die "LDFLAGS sed failed" + + epatch "${FILESDIR}"/${P}-makefile.patch } src_compile() { use static && append-ldflags -static econf || die - emake -j1 OPTIMIZEFLAGS="${CFLAGS}" || die + emake OPTIMIZEFLAGS="${CFLAGS}" || die } src_install() { |