diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-11-28 18:23:29 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-11-28 18:23:29 +0000 |
| commit | fcf1ab6968e9e1fb51a5b47c2bf203ffdf665fd2 (patch) | |
| tree | c2f04d75b9a575c7ce70a6a88d13995bc7e50c70 /app-misc | |
| parent | Version bump (bug #345733). (diff) | |
| download | gentoo-2-fcf1ab6968e9e1fb51a5b47c2bf203ffdf665fd2.tar.gz gentoo-2-fcf1ab6968e9e1fb51a5b47c2bf203ffdf665fd2.tar.bz2 gentoo-2-fcf1ab6968e9e1fb51a5b47c2bf203ffdf665fd2.zip | |
Fixes for broken patch
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/realpath/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/realpath/files/realpath-1.15-build.patch | 2 | ||||
| -rw-r--r-- | app-misc/realpath/files/realpath-1.15-prefix.patch | 22 |
3 files changed, 16 insertions, 14 deletions
diff --git a/app-misc/realpath/ChangeLog b/app-misc/realpath/ChangeLog index aa5d18e1dce8..8f8454551b87 100644 --- a/app-misc/realpath/ChangeLog +++ b/app-misc/realpath/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/realpath # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.11 2010/11/28 15:02:15 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.12 2010/11/28 18:23:29 jlec Exp $ + + 28 Nov 2010; Justin Lecher <jlec@gentoo.org> files/realpath-1.15-build.patch, + files/realpath-1.15-prefix.patch: + Fixes for broken patch *realpath-1.15-r3 (28 Nov 2010) diff --git a/app-misc/realpath/files/realpath-1.15-build.patch b/app-misc/realpath/files/realpath-1.15-build.patch index eb3defaea1b6..7f7d586f5736 100644 --- a/app-misc/realpath/files/realpath-1.15-build.patch +++ b/app-misc/realpath/files/realpath-1.15-build.patch @@ -10,7 +10,7 @@ index 18f539c..142f7e6 100644 -CFLAGS = -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Werror -g -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' -LDFLAGS := +CC ?= gcc -+CFLAGS += -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' ++CFLAGS += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' +LDFLAGS += LIBS := diff --git a/app-misc/realpath/files/realpath-1.15-prefix.patch b/app-misc/realpath/files/realpath-1.15-prefix.patch index 480425b2dfe6..f9534641382f 100644 --- a/app-misc/realpath/files/realpath-1.15-prefix.patch +++ b/app-misc/realpath/files/realpath-1.15-prefix.patch @@ -1,13 +1,14 @@ -* <grobian@gentoo.org>: /bin/sh is no good (on e.g. Solaris) same for perl - ---- common.mk -+++ common.mk -@@ -8,16 +8,17 @@ +diff --git a/common.mk b/common.mk +index 2443a40..0a342ee 100644 +--- a/common.mk ++++ b/common.mk +@@ -8,17 +8,19 @@ override TOPDIR := $(dir $(call getCurrentMakefileName)) override PACKAGE := realpath -PATH := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH) +#PATH := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH) ++ +SHELL := @GENTOO_PORTAGE_EPREFIX@/bin/bash # build abstraction @@ -21,11 +22,13 @@ compress := gzip -9f -prefix := /usr +-etcdir := /etc/$(PACKAGE) +prefix := @GENTOO_PORTAGE_EPREFIX@/usr - etcdir := /etc/$(PACKAGE) ++etcdir := @GENTOO_PORTAGE_EPREFIX@/etc/$(PACKAGE) bindir := $(prefix)/bin sbindir := $(prefix)/sbin -@@ -33,11 +34,11 @@ + mandir := $(prefix)/share/man +@@ -33,7 +35,7 @@ webdocrootdir := /var/www webcgidir := $(prefix)/lib/cgi-bin applicationsdir := $(prefix)/share/applications @@ -34,8 +37,3 @@ CC ?= gcc CFLAGS += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' LDFLAGS += --LIBS := -+LIBS += - - ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 |