summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal Stumpf <pascal@cvs.openbsd.org>2012-08-21 08:12:48 +0000
committerPascal Stumpf <pascal@cvs.openbsd.org>2012-08-21 08:12:48 +0000
commit14934cfc44663f6bc310cb36c07f25c380e664ae (patch)
tree760acf7938c7bcb6d963b1904f1265d921196e26
parenta547bfa7477edb126fd9866a307b5bf37588d9f4 (diff)
Build sed in distrib/ just like everything else. Simplifies PIE work since
we can now use NOPIE= for it. Note that NOPIE= is still a no-op atm. ok deraadt@
-rw-r--r--distrib/special/Makefile4
-rw-r--r--distrib/special/Makefile.inc1
-rw-r--r--distrib/special/sed/Makefile7
3 files changed, 10 insertions, 2 deletions
diff --git a/distrib/special/Makefile b/distrib/special/Makefile
index 4a32c5d09c7..12b30f76766 100644
--- a/distrib/special/Makefile
+++ b/distrib/special/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.24 2011/10/06 15:29:45 deraadt Exp $
+# $OpenBSD: Makefile,v 1.25 2012/08/21 08:12:47 pascal Exp $
SUBDIR= libstubs \
date dd dhclient dmesg ed ftp grep gzip ifconfig init \
- kbd less more mt newfs ping restore sha256 sysctl
+ kbd less more mt newfs ping restore sed sha256 sysctl
install:
diff --git a/distrib/special/Makefile.inc b/distrib/special/Makefile.inc
index 8e1a74e2da7..7dcd3d63e41 100644
--- a/distrib/special/Makefile.inc
+++ b/distrib/special/Makefile.inc
@@ -3,3 +3,4 @@
COPTS+=-Os
MAN=
LDSTATIC=-static
+NOPIE=
diff --git a/distrib/special/sed/Makefile b/distrib/special/sed/Makefile
new file mode 100644
index 00000000000..e8dad2782ec
--- /dev/null
+++ b/distrib/special/sed/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2012/08/21 08:12:47 pascal Exp $
+
+PROG= sed
+SRCS= compile.c main.c misc.c process.c
+
+.PATH: ${.CURDIR}/../../../usr.bin/sed
+.include <bsd.prog.mk>