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 :-)
This commit is contained in:
Alexander von Gluck IV
2014-12-03 21:36:06 +00:00
parent efbc036ece
commit 90b7a5fde8
2 changed files with 34 additions and 2 deletions

View File

@@ -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 <kallisti5@unixzen.com>
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

View File

@@ -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