diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-12-31 09:16:52 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-12-31 09:16:52 +0000 |
| commit | 0042798d5b850209d703971d00b483e5b4da6dfd (patch) | |
| tree | bb938fbfa235a871846a9614f76dcc25fcad39ba /sys-apps | |
| parent | old (diff) | |
| download | gentoo-2-0042798d5b850209d703971d00b483e5b4da6dfd.tar.gz gentoo-2-0042798d5b850209d703971d00b483e5b4da6dfd.tar.bz2 gentoo-2-0042798d5b850209d703971d00b483e5b4da6dfd.zip | |
touchup
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/ed/files/ed-1.0-build.patch | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sys-apps/ed/files/ed-1.0-build.patch b/sys-apps/ed/files/ed-1.0-build.patch index e0a45329b942..a4b48fc1c9a3 100644 --- a/sys-apps/ed/files/ed-1.0-build.patch +++ b/sys-apps/ed/files/ed-1.0-build.patch @@ -9,9 +9,8 @@ override if they so choose. * Only set CFLAGS/CXXFLAGS if user did not specify any. -diff -u ed-1.0/configure ed-1.0-new-patch/configure ---- ed-1.0/configure 2008-08-21 14:34:24.000000000 -0400 -+++ ed-1.0-new-patch/configure 2008-09-03 10:33:16.000000000 -0400 +--- ed-1.0/configure ++++ ed-1.0/configure @@ -14,6 +14,19 @@ progversion=1.0 srctrigger=ed.h @@ -50,20 +49,18 @@ diff -u ed-1.0/configure ed-1.0-new-patch/configure done +# Defaults if the user did not select any -+if [ x"${CFLAGS}" = x ] ; then ++if [ x"${CFLAGS+set}" != xset ] ; then + CFLAGS='-Wall -W -O2' +fi -+if [ x"${CXXFLAGS}" = x ] ; then ++if [ x"${CXXFLAGS+set}" = xset ] ; then + CXXFLAGS='-Wall -W -O2' +fi + # Find the source files, if location was not specified. srcdirtext= if [ x"${srcdir}" = x ] ; then -Common subdirectories: ed-1.0/doc and ed-1.0-new-patch/doc -diff -u ed-1.0/Makefile.in ed-1.0-new-patch/Makefile.in ---- ed-1.0/Makefile.in 2008-05-04 11:57:10.000000000 -0400 -+++ ed-1.0-new-patch/Makefile.in 2008-09-03 10:38:37.000000000 -0400 +--- ed-1.0/Makefile.in ++++ ed-1.0/Makefile.in @@ -44,11 +44,11 @@ check : $(progname) $(VPATH)/testsuite/check.sh @$(VPATH)/testsuite/check.sh $(VPATH)/testsuite @@ -87,4 +84,3 @@ diff -u ed-1.0/Makefile.in ed-1.0-new-patch/Makefile.in install-strip : all $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install -Common subdirectories: ed-1.0/testsuite and ed-1.0-new-patch/testsuite |