1 |
vapier 08/12/31 09:16:52 |
2 |
|
3 |
Modified: ed-1.0-build.patch |
4 |
Log: |
5 |
touchup |
6 |
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 sys-apps/ed/files/ed-1.0-build.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/ed/files/ed-1.0-build.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/ed/files/ed-1.0-build.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/ed/files/ed-1.0-build.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: ed-1.0-build.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/ed/files/ed-1.0-build.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- ed-1.0-build.patch 3 Sep 2008 14:42:07 -0000 1.1 |
22 |
+++ ed-1.0-build.patch 31 Dec 2008 09:16:52 -0000 1.2 |
23 |
@@ -9,9 +9,8 @@ |
24 |
override if they so choose. |
25 |
* Only set CFLAGS/CXXFLAGS if user did not specify any. |
26 |
|
27 |
-diff -u ed-1.0/configure ed-1.0-new-patch/configure |
28 |
---- ed-1.0/configure 2008-08-21 14:34:24.000000000 -0400 |
29 |
-+++ ed-1.0-new-patch/configure 2008-09-03 10:33:16.000000000 -0400 |
30 |
+--- ed-1.0/configure |
31 |
++++ ed-1.0/configure |
32 |
@@ -14,6 +14,19 @@ |
33 |
progversion=1.0 |
34 |
srctrigger=ed.h |
35 |
@@ -50,20 +49,18 @@ |
36 |
done |
37 |
|
38 |
+# Defaults if the user did not select any |
39 |
-+if [ x"${CFLAGS}" = x ] ; then |
40 |
++if [ x"${CFLAGS+set}" != xset ] ; then |
41 |
+ CFLAGS='-Wall -W -O2' |
42 |
+fi |
43 |
-+if [ x"${CXXFLAGS}" = x ] ; then |
44 |
++if [ x"${CXXFLAGS+set}" = xset ] ; then |
45 |
+ CXXFLAGS='-Wall -W -O2' |
46 |
+fi |
47 |
+ |
48 |
# Find the source files, if location was not specified. |
49 |
srcdirtext= |
50 |
if [ x"${srcdir}" = x ] ; then |
51 |
-Common subdirectories: ed-1.0/doc and ed-1.0-new-patch/doc |
52 |
-diff -u ed-1.0/Makefile.in ed-1.0-new-patch/Makefile.in |
53 |
---- ed-1.0/Makefile.in 2008-05-04 11:57:10.000000000 -0400 |
54 |
-+++ ed-1.0-new-patch/Makefile.in 2008-09-03 10:38:37.000000000 -0400 |
55 |
+--- ed-1.0/Makefile.in |
56 |
++++ ed-1.0/Makefile.in |
57 |
@@ -44,11 +44,11 @@ |
58 |
check : $(progname) $(VPATH)/testsuite/check.sh |
59 |
@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite |
60 |
@@ -87,4 +84,3 @@ |
61 |
|
62 |
install-strip : all |
63 |
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install |
64 |
-Common subdirectories: ed-1.0/testsuite and ed-1.0-new-patch/testsuite |