diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-09-22 21:25:22 +0000 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-09-22 21:25:22 +0000 |
| commit | 55e359cea7d6957080a60288f36c16f25203c26b (patch) | |
| tree | 52304eabe674193af01dde88865aa9e871d2d683 /sysutils/cbsd | |
| parent | b6cc085dce9bbef96c63bde511027658fd5c2f83 (diff) | |
| download | ports-55e359cea7d6957080a60288f36c16f25203c26b.tar.gz ports-55e359cea7d6957080a60288f36c16f25203c26b.zip | |
sysutils/cbsd: fix build on non-x86
sse4.2 is supported only on i386 and amd64.
Notes
Notes:
svn path=/head/; revision=549636
Diffstat (limited to 'sysutils/cbsd')
| -rw-r--r-- | sysutils/cbsd/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/cbsd/files/extra-patch-Makefile | 10 | ||||
| -rw-r--r-- | sysutils/cbsd/files/extra-patch-sudoexec_initenv | 10 |
3 files changed, 27 insertions, 0 deletions
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index b18dbb8c06f6..4f4768498fd3 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -32,6 +32,13 @@ BIN_FILES= \ bin/cbsdsh/mknodes \ bin/cbsdsh/mksyntax +.include <bsd.port.options.mk> + +.if ${ARCH} != amd64 && ${ARCH} != i386 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile \ + ${FILESDIR}/extra-patch-sudoexec_initenv +.endif + do-install: @${ECHO} "Installing in ${CBSD_HOME}" ${MKDIR} ${STAGEDIR}${CBSD_HOME} diff --git a/sysutils/cbsd/files/extra-patch-Makefile b/sysutils/cbsd/files/extra-patch-Makefile new file mode 100644 index 000000000000..e29fe9c25376 --- /dev/null +++ b/sysutils/cbsd/files/extra-patch-Makefile @@ -0,0 +1,10 @@ +--- Makefile.orig 2020-09-22 20:57:26 UTC ++++ Makefile +@@ -96,7 +96,6 @@ cbsd: pkg-config-check + ${CC} misc/src/fmagic.c -lmagic -o misc/fmagic && ${STRIP} misc/fmagic + ${CC} misc/src/conv2human.c -I/usr/local/include -I/usr/local/include/libelf -L/usr/local/lib -lelf -o misc/conv2human -lutil && ${STRIP} misc/conv2human + ${CC} misc/src/cbsd_fwatch.c -o misc/cbsd_fwatch && ${STRIP} misc/cbsd_fwatch +- ${CC} misc/src/popcnttest.c -o misc/popcnttest -msse4.2 && ${STRIP} misc/popcnttest > /dev/null 2>&1 || /usr/bin/true + ${CC} misc/src/cbsd_dot.c -o misc/cbsd_dot && ${STRIP} misc/cbsd_dot + ${CC} misc/src/daemon.c -lutil -o misc/daemon && ${STRIP} misc/daemon + ${CC} misc/src/resolv.c -o misc/resolv && ${STRIP} misc/resolv diff --git a/sysutils/cbsd/files/extra-patch-sudoexec_initenv b/sysutils/cbsd/files/extra-patch-sudoexec_initenv new file mode 100644 index 000000000000..99b7a08f7810 --- /dev/null +++ b/sysutils/cbsd/files/extra-patch-sudoexec_initenv @@ -0,0 +1,10 @@ +--- sudoexec/initenv.orig 2020-09-22 20:57:34 UTC ++++ sudoexec/initenv +@@ -331,7 +331,6 @@ phase2() + [ ! -f "${distdir}/misc/conv2human" ] && ${CC_CMD} -I/usr/local/include -I/usr/local/include/libelf -L/usr/local/lib ${distdir}/misc/src/conv2human.c -lelf -o ${distdir}/misc/conv2human -lutil + [ ! -f "${distdir}/misc/cbsd_fwatch" ] && ${CC_CMD} ${distdir}/misc/src/cbsd_fwatch.c -o ${distdir}/misc/cbsd_fwatch + [ ! -f "${distdir}/misc/cbsd_dot" ] && ${CC_CMD} ${distdir}/misc/src/cbsd_dot.c -o ${distdir}/misc/cbsd_dot +- [ ! -f "${distdir}/misc/popcnttest" ] && ${CC_CMD} ${distdir}/misc/src/popcnttest.c -o ${distdir}/misc/popcnttest -msse4.2 > /dev/null 2>&1 || /usr/bin/true + [ ! -f "${distdir}/misc/chk_arp_byip" ] && ${CC_CMD} ${distdir}/misc/src/chk_arp_byip.c -o ${distdir}/misc/chk_arp_byip + [ ! -f "${distdir}/misc/cbsdtee" ] && ${CC_CMD} ${distdir}/misc/src/cbsdtee.c -o ${distdir}/misc/cbsdtee + [ ! -f "${distdir}/misc/daemon" ] && ${CC_CMD} ${distdir}/misc/src/daemon.c -lutil -o ${distdir}/misc/daemon |