summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpascal <pascal@openbsd.org>2012-08-21 08:12:47 +0000
committerpascal <pascal@openbsd.org>2012-08-21 08:12:47 +0000
commitfa4e3b285556d37206f9d3d95743800b8119897e (patch)
tree28daa214d7d4e6b562d94789f2d15fc5f60e9371
parentUse the new "-q" option of pgrep(1) instead of redirecting stdout (diff)
downloadwireguard-openbsd-fa4e3b285556d37206f9d3d95743800b8119897e.tar.xz
wireguard-openbsd-fa4e3b285556d37206f9d3d95743800b8119897e.zip
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>