From owner-svn-ports-all@freebsd.org Tue Sep 22 21:25:23 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A0FAB3F795B; Tue, 22 Sep 2020 21:25:23 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BwvVC2mn4z4g1r; Tue, 22 Sep 2020 21:25:23 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4375125C19; Tue, 22 Sep 2020 21:25:23 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08MLPNrG016104; Tue, 22 Sep 2020 21:25:23 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08MLPMBh016101; Tue, 22 Sep 2020 21:25:22 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202009222125.08MLPMBh016101@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 22 Sep 2020 21:25:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549636 - in head/sysutils/cbsd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/sysutils/cbsd: . files X-SVN-Commit-Revision: 549636 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Sep 2020 21:25:23 -0000 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 + +.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