From e101a71e1b5c881d23346f5aca2b53da6f649278 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Fri, 19 Nov 2010 08:00:36 +0800 Subject: ed: Update to 1.5 Signed-off-by: Zhai Edwin --- meta/recipes-extended/ed/ed-1.4/ed-1.2-build.patch | 43 ---------------------- meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch | 43 ++++++++++++++++++++++ meta/recipes-extended/ed/ed_1.4.bb | 22 ----------- meta/recipes-extended/ed/ed_1.5.bb | 22 +++++++++++ 4 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 meta/recipes-extended/ed/ed-1.4/ed-1.2-build.patch create mode 100644 meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch delete mode 100644 meta/recipes-extended/ed/ed_1.4.bb create mode 100644 meta/recipes-extended/ed/ed_1.5.bb diff --git a/meta/recipes-extended/ed/ed-1.4/ed-1.2-build.patch b/meta/recipes-extended/ed/ed-1.4/ed-1.2-build.patch deleted file mode 100644 index a65c433d5..000000000 --- a/meta/recipes-extended/ed/ed-1.4/ed-1.2-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html - -2007-04-16 Mike Frysinger - - * Do not set CC/CXX/CPPFLAGS/LDFLAGS to "" so that user can - override if they so choose. - * Only set CFLAGS/CXXFLAGS if user did not specify any. - -ed had already taken GPLv3 when this patch out, so it should be GPLv3. -Signed-off-by: Zhai Edwin - -Index: ed-1.4/configure -=================================================================== ---- ed-1.4.orig/configure 2009-07-10 19:54:33.000000000 +0800 -+++ ed-1.4/configure 2010-08-05 17:41:51.000000000 +0800 -@@ -26,12 +26,6 @@ - mandir='$(datadir)/man' - sysconfdir='$(prefix)/etc' - program_prefix= --CC= --CXX= --CPPFLAGS= --CFLAGS='-Wall -W -O2' --CXXFLAGS='-Wall -W -O2' --LDFLAGS= - - # Loop over all args - while [ x"$1" != x ] ; do -@@ -111,6 +105,14 @@ - esac - done - -+# Defaults if the user did not select any -+if [ x"${CFLAGS+set}" != xset ] ; then -+ CFLAGS='-Wall -W -O2' -+fi -+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 diff --git a/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch b/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch new file mode 100644 index 000000000..a65c433d5 --- /dev/null +++ b/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch @@ -0,0 +1,43 @@ +http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html + +2007-04-16 Mike Frysinger + + * Do not set CC/CXX/CPPFLAGS/LDFLAGS to "" so that user can + override if they so choose. + * Only set CFLAGS/CXXFLAGS if user did not specify any. + +ed had already taken GPLv3 when this patch out, so it should be GPLv3. +Signed-off-by: Zhai Edwin + +Index: ed-1.4/configure +=================================================================== +--- ed-1.4.orig/configure 2009-07-10 19:54:33.000000000 +0800 ++++ ed-1.4/configure 2010-08-05 17:41:51.000000000 +0800 +@@ -26,12 +26,6 @@ + mandir='$(datadir)/man' + sysconfdir='$(prefix)/etc' + program_prefix= +-CC= +-CXX= +-CPPFLAGS= +-CFLAGS='-Wall -W -O2' +-CXXFLAGS='-Wall -W -O2' +-LDFLAGS= + + # Loop over all args + while [ x"$1" != x ] ; do +@@ -111,6 +105,14 @@ + esac + done + ++# Defaults if the user did not select any ++if [ x"${CFLAGS+set}" != xset ] ; then ++ CFLAGS='-Wall -W -O2' ++fi ++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 diff --git a/meta/recipes-extended/ed/ed_1.4.bb b/meta/recipes-extended/ed/ed_1.4.bb deleted file mode 100644 index 0243769e9..000000000 --- a/meta/recipes-extended/ed/ed_1.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "a line-oriented text editor" -HOMEPAGE = "http://www.gnu.org/software/ed/" -BUGTRACKER = "" - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ - file://ed.h;endline=20;md5=294d5da73d15cd444ca2260fa2538296 \ - file://main.c;endline=24;md5=122be7f2751ae819c803441972c7f45b" - -SECTION = "base" -PR = "r0" - -SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz \ - file://ed-1.2-build.patch" - -do_configure() { - ${S}/configure -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} diff --git a/meta/recipes-extended/ed/ed_1.5.bb b/meta/recipes-extended/ed/ed_1.5.bb new file mode 100644 index 000000000..0243769e9 --- /dev/null +++ b/meta/recipes-extended/ed/ed_1.5.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "a line-oriented text editor" +HOMEPAGE = "http://www.gnu.org/software/ed/" +BUGTRACKER = "" + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ + file://ed.h;endline=20;md5=294d5da73d15cd444ca2260fa2538296 \ + file://main.c;endline=24;md5=122be7f2751ae819c803441972c7f45b" + +SECTION = "base" +PR = "r0" + +SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz \ + file://ed-1.2-build.patch" + +do_configure() { + ${S}/configure +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} -- cgit v1.2.3