Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Sep 2020 21:25:22 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r549636 - in head/sysutils/cbsd: . files
Message-ID:  <202009222125.08MLPMBh016101@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Tue Sep 22 21:25:22 2020
New Revision: 549636
URL: https://svnweb.freebsd.org/changeset/ports/549636

Log:
  sysutils/cbsd: fix build on non-x86
  
  sse4.2 is supported only on i386 and amd64.

Added:
  head/sysutils/cbsd/files/extra-patch-Makefile   (contents, props changed)
  head/sysutils/cbsd/files/extra-patch-sudoexec_initenv   (contents, props changed)
Modified:
  head/sysutils/cbsd/Makefile

Modified: head/sysutils/cbsd/Makefile
==============================================================================
--- head/sysutils/cbsd/Makefile	Tue Sep 22 21:17:33 2020	(r549635)
+++ head/sysutils/cbsd/Makefile	Tue Sep 22 21:25:22 2020	(r549636)
@@ -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}

Added: head/sysutils/cbsd/files/extra-patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/cbsd/files/extra-patch-Makefile	Tue Sep 22 21:25:22 2020	(r549636)
@@ -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

Added: head/sysutils/cbsd/files/extra-patch-sudoexec_initenv
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/cbsd/files/extra-patch-sudoexec_initenv	Tue Sep 22 21:25:22 2020	(r549636)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009222125.08MLPMBh016101>