From 90b7a5fde86022c830d5b7c97cd591180d1ae345 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 3 Dec 2014 21:36:06 +0000 Subject: [PATCH] sed: Sed is now self-satisfying * Don't require sed to build sed * I am noting a HaikuPorter sed requirement slipping through however: /wrapper-script: line 137: sed: command not found Doesn't seem to impact final result * This should help remove the need for the sed bootstrap package :-) --- sys-apps/sed/patches/sed-4.2.1.patchset | 25 +++++++++++++++++++++++++ sys-apps/sed/sed-4.2.1.recipe | 11 +++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/sys-apps/sed/patches/sed-4.2.1.patchset b/sys-apps/sed/patches/sed-4.2.1.patchset index 243da1404..8055cbfc8 100644 --- a/sys-apps/sed/patches/sed-4.2.1.patchset +++ b/sys-apps/sed/patches/sed-4.2.1.patchset @@ -40,3 +40,28 @@ index af57f41..89638a0 100755 -- 1.7.10.2 +From 37775f6c688e2c19dec837edb41a6e9fbeaebc32 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Wed, 3 Dec 2014 20:52:57 +0000 +Subject: [PATCH] bootstrap: add missing COPYRIGHT_YEAR + +--- + bootstrap.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/bootstrap.sh b/bootstrap.sh +index 091f57c..882b9cf 100755 +--- a/bootstrap.sh ++++ b/bootstrap.sh +@@ -37,6 +37,8 @@ if test -f config.h; then :; else + #define HAVE_WCHAR_H 1 + #define HAVE_MBRTOWC 1 + ++#define COPYRIGHT_YEAR 2000 ++ + /* Toggle if you encounter errors in lib/mkstemp.c. */ + #define HAVE_UNISTD_H 1 + #define HAVE_FCNTL_H 1 +-- +1.8.3.4 + diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index 035b553b2..b8e8c58d7 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -29,8 +29,7 @@ BUILD_PREREQUIRES=" cmd:gcc cmd:ld cmd:make - cmd:perl - cmd:sed + cmd:awk cmd:grep " @@ -40,6 +39,11 @@ defineDebugInfoPackage sed \ BUILD() { + # First we bootstrap to generate a really boring sed + ./bootstrap.sh + export PATH="${sourceDir}/sed/:${PATH}" + echo $PATH + runConfigure ./configure \ --enable-regex-tests --without-included-regex \ --disable-rpath --with-gnu-ld @@ -48,6 +52,9 @@ BUILD() INSTALL() { + # Use our generated sed for make + export PATH="${sourceDir}/sed/:${PATH}" + make install rm $libDir/charset.alias rmdir $libDir