mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

sysutils/cbsd: fix build on non-x86

Browse Source 
sse4.2 is supported only on i386 and amd64.
This commit is contained in:
Piotr Kubaj 2020-09-22 21:25:22 +00:00
parent b6cc085dce
commit 55e359cea7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=549636
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysutils/cbsd/Makefile
View File

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

10
sysutils/cbsd/files/extra-patch-Makefile Normal file
View File

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

10
sysutils/cbsd/files/extra-patch-sudoexec_initenv Normal file
View File

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