| 1 |
jlec 10/11/28 18:23:29 |
| 2 |
|
| 3 |
Modified: realpath-1.15-build.patch |
| 4 |
realpath-1.15-prefix.patch |
| 5 |
Log: |
| 6 |
Fixes for broken patch |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 app-misc/realpath/files/realpath-1.15-build.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/realpath/files/realpath-1.15-build.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/realpath/files/realpath-1.15-build.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/realpath/files/realpath-1.15-build.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: realpath-1.15-build.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/realpath/files/realpath-1.15-build.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- realpath-1.15-build.patch 28 Nov 2010 15:02:15 -0000 1.1 |
| 24 |
+++ realpath-1.15-build.patch 28 Nov 2010 18:23:29 -0000 1.2 |
| 25 |
@@ -10,7 +10,7 @@ |
| 26 |
-CFLAGS = -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Werror -g -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' |
| 27 |
-LDFLAGS := |
| 28 |
+CC ?= gcc |
| 29 |
-+CFLAGS += -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' |
| 30 |
++CFLAGS += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' |
| 31 |
+LDFLAGS += |
| 32 |
LIBS := |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.2 app-misc/realpath/files/realpath-1.15-prefix.patch |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/realpath/files/realpath-1.15-prefix.patch?rev=1.2&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/realpath/files/realpath-1.15-prefix.patch?rev=1.2&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/realpath/files/realpath-1.15-prefix.patch?r1=1.1&r2=1.2 |
| 42 |
|
| 43 |
Index: realpath-1.15-prefix.patch |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/realpath/files/realpath-1.15-prefix.patch,v |
| 46 |
retrieving revision 1.1 |
| 47 |
retrieving revision 1.2 |
| 48 |
diff -u -r1.1 -r1.2 |
| 49 |
--- realpath-1.15-prefix.patch 15 Jun 2010 11:39:10 -0000 1.1 |
| 50 |
+++ realpath-1.15-prefix.patch 28 Nov 2010 18:23:29 -0000 1.2 |
| 51 |
@@ -1,13 +1,14 @@ |
| 52 |
-* <grobian@g.o>: /bin/sh is no good (on e.g. Solaris) same for perl |
| 53 |
- |
| 54 |
---- common.mk |
| 55 |
-+++ common.mk |
| 56 |
-@@ -8,16 +8,17 @@ |
| 57 |
+diff --git a/common.mk b/common.mk |
| 58 |
+index 2443a40..0a342ee 100644 |
| 59 |
+--- a/common.mk |
| 60 |
++++ b/common.mk |
| 61 |
+@@ -8,17 +8,19 @@ override TOPDIR := $(dir $(call getCurrentMakefileName)) |
| 62 |
|
| 63 |
override PACKAGE := realpath |
| 64 |
|
| 65 |
-PATH := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH) |
| 66 |
+#PATH := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH) |
| 67 |
++ |
| 68 |
+SHELL := @GENTOO_PORTAGE_EPREFIX@/bin/bash |
| 69 |
|
| 70 |
# build abstraction |
| 71 |
@@ -21,11 +22,13 @@ |
| 72 |
compress := gzip -9f |
| 73 |
|
| 74 |
-prefix := /usr |
| 75 |
+-etcdir := /etc/$(PACKAGE) |
| 76 |
+prefix := @GENTOO_PORTAGE_EPREFIX@/usr |
| 77 |
- etcdir := /etc/$(PACKAGE) |
| 78 |
++etcdir := @GENTOO_PORTAGE_EPREFIX@/etc/$(PACKAGE) |
| 79 |
bindir := $(prefix)/bin |
| 80 |
sbindir := $(prefix)/sbin |
| 81 |
-@@ -33,11 +34,11 @@ |
| 82 |
+ mandir := $(prefix)/share/man |
| 83 |
+@@ -33,7 +35,7 @@ webdocrootdir := /var/www |
| 84 |
webcgidir := $(prefix)/lib/cgi-bin |
| 85 |
applicationsdir := $(prefix)/share/applications |
| 86 |
|
| 87 |
@@ -34,8 +37,3 @@ |
| 88 |
CC ?= gcc |
| 89 |
CFLAGS += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' |
| 90 |
LDFLAGS += |
| 91 |
--LIBS := |
| 92 |
-+LIBS += |
| 93 |
- |
| 94 |
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) |
| 95 |
- CFLAGS += -O0 |
Archives