From 35c7864ee92ce38bd2992813c0ab15af9977417a Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Sun, 22 Jan 2012 16:56:25 +0800 Subject: ed: upgrade to 1.6 This patch is to upgrade ed to 1.6, and the change of license checksum is because the diff between two ed.h files: 3c3,4 < Copyright (C) 1993, 1994, 2006, 2007, 2008, 2009, 2010 --- > Copyright (C) 1993, 1994 Andrew Moore, Talke Studio > Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 the diff between two main.c files: 2c2 < Copyright (C) 1993, 1994, 2006, 2007, 2008, 2009, 2010 --- > Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 46d45 Signed-off-by: Shane Wang --- meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch | 43 ---------------------- meta/recipes-extended/ed/ed-1.6/ed-1.2-build.patch | 43 ++++++++++++++++++++++ meta/recipes-extended/ed/ed_1.5.bb | 28 -------------- meta/recipes-extended/ed/ed_1.6.bb | 28 ++++++++++++++ 4 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch create mode 100644 meta/recipes-extended/ed/ed-1.6/ed-1.2-build.patch delete mode 100644 meta/recipes-extended/ed/ed_1.5.bb create mode 100644 meta/recipes-extended/ed/ed_1.6.bb (limited to 'meta/recipes-extended/ed') 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 deleted file mode 100644 index d30b393364..0000000000 --- a/meta/recipes-extended/ed/ed-1.5/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 - -Upstream-Status: Pending - -Index: ed-1.5/configure -=================================================================== ---- ed-1.5.orig/configure 2010-08-30 07:34:49.000000000 -0700 -+++ ed-1.5/configure 2010-11-20 16:42:20.490645823 -0800 -@@ -26,10 +26,6 @@ - mandir='$(datadir)/man' - sysconfdir='$(prefix)/etc' - program_prefix= --CC= --CPPFLAGS= --CFLAGS='-Wall -W -O2' --LDFLAGS= - - # Loop over all args - while [ -n "$1" ] ; do -@@ -105,6 +101,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 [ -z "${srcdir}" ] ; then diff --git a/meta/recipes-extended/ed/ed-1.6/ed-1.2-build.patch b/meta/recipes-extended/ed/ed-1.6/ed-1.2-build.patch new file mode 100644 index 0000000000..d30b393364 --- /dev/null +++ b/meta/recipes-extended/ed/ed-1.6/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 + +Upstream-Status: Pending + +Index: ed-1.5/configure +=================================================================== +--- ed-1.5.orig/configure 2010-08-30 07:34:49.000000000 -0700 ++++ ed-1.5/configure 2010-11-20 16:42:20.490645823 -0800 +@@ -26,10 +26,6 @@ + mandir='$(datadir)/man' + sysconfdir='$(prefix)/etc' + program_prefix= +-CC= +-CPPFLAGS= +-CFLAGS='-Wall -W -O2' +-LDFLAGS= + + # Loop over all args + while [ -n "$1" ] ; do +@@ -105,6 +101,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 [ -z "${srcdir}" ] ; then diff --git a/meta/recipes-extended/ed/ed_1.5.bb b/meta/recipes-extended/ed/ed_1.5.bb deleted file mode 100644 index d4e8a81458..0000000000 --- a/meta/recipes-extended/ed/ed_1.5.bb +++ /dev/null @@ -1,28 +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=238781cd8e436dabb0e9f18443400066 \ - file://main.c;endline=24;md5=177fe82d0649e545591a13fdce5733e8" - -SECTION = "base" -PR = "r1" - -# LSB states that ed should be in /bin/ -bindir = "${base_bindir}" - -SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz \ - file://ed-1.2-build.patch" - -SRC_URI[md5sum] = "e66c03d7e4c67b025d5b6093ec678267" -SRC_URI[sha256sum] = "97dd34a49ebc9c97e414b90a087d63eafc41377a340848c97e75a9cba187fba1" - -do_configure() { - ${S}/configure -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} diff --git a/meta/recipes-extended/ed/ed_1.6.bb b/meta/recipes-extended/ed/ed_1.6.bb new file mode 100644 index 0000000000..cc72588f08 --- /dev/null +++ b/meta/recipes-extended/ed/ed_1.6.bb @@ -0,0 +1,28 @@ +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=c708cda1b2e8d723d458690b7db03878 \ + file://main.c;endline=24;md5=1bd039d59e04ee5f82adcc970144a2c3" + +SECTION = "base" +PR = "r0" + +# LSB states that ed should be in /bin/ +bindir = "${base_bindir}" + +SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz \ + file://ed-1.2-build.patch" + +SRC_URI[md5sum] = "9a78593decccaa889523aa4bb555ed4b" +SRC_URI[sha256sum] = "211c67b0c4aae277d34b1c5f842db1952e468e5905142868e4718ac838f08a65" + +do_configure() { + ${S}/configure +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} -- cgit 1.2.3-korg