From owner-svn-ports-head@freebsd.org Tue Oct 17 02:29:26 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0B2AE4FA8B; Tue, 17 Oct 2017 02:29:26 +0000 (UTC) (envelope-from vanilla@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 mx1.freebsd.org (Postfix) with ESMTPS id 8AB607CF1A; Tue, 17 Oct 2017 02:29:26 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9H2TPGT075692; Tue, 17 Oct 2017 02:29:25 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9H2TOD2075684; Tue, 17 Oct 2017 02:29:24 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <201710170229.v9H2TOD2075684@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Tue, 17 Oct 2017 02:29:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452259 - in head/misc/rump: . files X-SVN-Group: ports-head X-SVN-Commit-Author: vanilla X-SVN-Commit-Paths: in head/misc/rump: . files X-SVN-Commit-Revision: 452259 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Oct 2017 02:29:26 -0000 Author: vanilla Date: Tue Oct 17 02:29:24 2017 New Revision: 452259 URL: https://svnweb.freebsd.org/changeset/ports/452259 Log: remove aarch64 from NOT_FOR_ARCHS, rump can build without any issue on rpi3 now. Modified: head/misc/rump/Makefile head/misc/rump/files/patch-buildrump.sh head/misc/rump/files/patch-src_sys_net_agr_if__agr.c head/misc/rump/files/patch-src_sys_net_if__pppoe.c head/misc/rump/files/patch-src_sys_net_if__tap.c head/misc/rump/files/patch-src_sys_netinet_in__offload.c head/misc/rump/files/patch-src_sys_netinet_ip__carp.c head/misc/rump/pkg-plist Modified: head/misc/rump/Makefile ============================================================================== --- head/misc/rump/Makefile Tue Oct 17 02:17:28 2017 (r452258) +++ head/misc/rump/Makefile Tue Oct 17 02:29:24 2017 (r452259) @@ -11,7 +11,7 @@ COMMENT= Virtualized NetBSD kernel components in users LICENSE= BSD2CLAUSE -NOT_FOR_ARCHS= aarch64 armv6 mips mips64 powerpc powerpc64 sparc64 +NOT_FOR_ARCHS= armv6 mips mips64 powerpc powerpc64 sparc64 NOT_FOR_ARCHS_REASON= not yet ported to FreeBSD on this architecture USE_GITHUB= yes @@ -22,6 +22,12 @@ GH_TUPLE= rumpkernel:src-netbsd:82f3a69:netbsd/src USE_LDCONFIG= yes .include + +.if ${ARCH} == "i386" || ${ARCH} == "amd64" +PLIST_SUB+= X8664="" +.else +PLIST_SUB+= X8664="@comment " +.endif .if ${OSVERSION} >= 1100121 CFLAGS+= -Wno-address-of-packed-member Modified: head/misc/rump/files/patch-buildrump.sh ============================================================================== --- head/misc/rump/files/patch-buildrump.sh Tue Oct 17 02:17:28 2017 (r452258) +++ head/misc/rump/files/patch-buildrump.sh Tue Oct 17 02:29:24 2017 (r452259) @@ -1,6 +1,25 @@ --- buildrump.sh.orig 2017-03-28 02:35:28 UTC +++ buildrump.sh -@@ -1059,6 +1059,7 @@ evaltoolchain () +@@ -177,6 +177,9 @@ probeld () + elif echo ${linkervers} | grep -q 'GNU gold' ; then + LD_FLAVOR=gold + LD_AS_NEEDED='-Wl,--no-as-needed' ++ elif echo ${linkervers} | grep -q 'LLD' ; then ++ LD_FLAVOR=GNU ++ LD_AS_NEEDED='-Wl,--no-as-needed' + elif echo ${linkervers} | grep -q 'Solaris Link Editor' ; then + LD_FLAVOR=sun + SHLIB_MKMAP=no +@@ -788,6 +791,8 @@ makebuild () + -o ${MACHINE#evbearm} != ${MACHINE} \ + -o ${MACHINE#evbppc} != ${MACHINE} ]; then + DIRS_emul=sys/rump/kern/lib/libsys_linux ++ else ++ DIRS_emul= + fi + ${SYS_SUNOS} && appendvar DIRS_emul sys/rump/kern/lib/libsys_sunos + if ${HIJACK}; then +@@ -1059,6 +1064,7 @@ evaltoolchain () ;; *-freebsd*) RUMPKERN_UNDEF='-U__FreeBSD__' Modified: head/misc/rump/files/patch-src_sys_net_agr_if__agr.c ============================================================================== --- head/misc/rump/files/patch-src_sys_net_agr_if__agr.c Tue Oct 17 02:17:28 2017 (r452258) +++ head/misc/rump/files/patch-src_sys_net_agr_if__agr.c Tue Oct 17 02:29:24 2017 (r452259) @@ -1,6 +1,6 @@ --- src/sys/net/agr/if_agr.c.orig 2016-08-02 11:51:10 UTC +++ src/sys/net/agr/if_agr.c -@@ -317,6 +317,7 @@ agr_clone_create(struct if_clone *ifc, i +@@ -317,6 +317,7 @@ agr_clone_create(struct if_clone *ifc, int unit) { struct agr_softc *sc; struct ifnet *ifp; @@ -8,7 +8,7 @@ sc = agr_alloc_softc(); TAILQ_INIT(&sc->sc_ports); -@@ -330,7 +331,7 @@ agr_clone_create(struct if_clone *ifc, i +@@ -330,7 +331,7 @@ agr_clone_create(struct if_clone *ifc, int unit) ifc->ifc_name, unit); ifp->if_softc = sc; Modified: head/misc/rump/files/patch-src_sys_net_if__pppoe.c ============================================================================== --- head/misc/rump/files/patch-src_sys_net_if__pppoe.c Tue Oct 17 02:17:28 2017 (r452258) +++ head/misc/rump/files/patch-src_sys_net_if__pppoe.c Tue Oct 17 02:29:24 2017 (r452259) @@ -1,6 +1,6 @@ --- src/sys/net/if_pppoe.c.orig 2016-08-02 11:51:10 UTC +++ src/sys/net/if_pppoe.c -@@ -227,7 +227,8 @@ pppoe_clone_create(struct if_clone *ifc, +@@ -227,7 +227,8 @@ pppoe_clone_create(struct if_clone *ifc, int unit) if_initname(&sc->sc_sppp.pp_if, "pppoe", unit); sc->sc_sppp.pp_if.if_softc = sc; sc->sc_sppp.pp_if.if_mtu = PPPOE_MAXMTU; Modified: head/misc/rump/files/patch-src_sys_net_if__tap.c ============================================================================== --- head/misc/rump/files/patch-src_sys_net_if__tap.c Tue Oct 17 02:17:28 2017 (r452258) +++ head/misc/rump/files/patch-src_sys_net_if__tap.c Tue Oct 17 02:29:24 2017 (r452259) @@ -1,6 +1,6 @@ --- src/sys/net/if_tap.c.orig 2016-08-02 11:51:10 UTC +++ src/sys/net/if_tap.c -@@ -332,7 +332,8 @@ tap_attach(device_t parent, device_t sel +@@ -332,7 +332,8 @@ tap_attach(device_t parent, device_t self, void *aux) ifp = &sc->sc_ec.ec_if; strcpy(ifp->if_xname, device_xname(self)); ifp->if_softc = sc; Modified: head/misc/rump/files/patch-src_sys_netinet_in__offload.c ============================================================================== --- head/misc/rump/files/patch-src_sys_netinet_in__offload.c Tue Oct 17 02:17:28 2017 (r452258) +++ head/misc/rump/files/patch-src_sys_netinet_in__offload.c Tue Oct 17 02:29:24 2017 (r452259) @@ -1,6 +1,6 @@ --- src/sys/netinet/in_offload.c.orig 2016-08-02 11:51:10 UTC +++ src/sys/netinet/in_offload.c -@@ -210,9 +210,10 @@ ip_undefer_csum(struct mbuf *m, size_t h +@@ -210,9 +210,10 @@ ip_undefer_csum(struct mbuf *m, size_t hdrlen, int csu if (__predict_true(hdrlen + sizeof(struct ip) <= m->m_len)) { struct ip *ip = (struct ip *)(mtod(m, uint8_t *) + hdrlen); Modified: head/misc/rump/files/patch-src_sys_netinet_ip__carp.c ============================================================================== --- head/misc/rump/files/patch-src_sys_netinet_ip__carp.c Tue Oct 17 02:17:28 2017 (r452258) +++ head/misc/rump/files/patch-src_sys_netinet_ip__carp.c Tue Oct 17 02:29:24 2017 (r452259) @@ -1,6 +1,6 @@ --- src/sys/netinet/ip_carp.c.orig 2016-08-02 11:51:10 UTC +++ src/sys/netinet/ip_carp.c -@@ -827,7 +827,8 @@ carp_clone_create(struct if_clone *ifc, +@@ -827,7 +827,8 @@ carp_clone_create(struct if_clone *ifc, int unit) ifp->if_softc = sc; snprintf(ifp->if_xname, sizeof ifp->if_xname, "%s%d", ifc->ifc_name, unit); Modified: head/misc/rump/pkg-plist ============================================================================== --- head/misc/rump/pkg-plist Tue Oct 17 02:17:28 2017 (r452258) +++ head/misc/rump/pkg-plist Tue Oct 17 02:29:24 2017 (r452259) @@ -281,16 +281,16 @@ lib/librumpkern_crypto.so lib/librumpkern_crypto.so.0 lib/librumpkern_crypto.so.0.0 lib/librumpkern_crypto_pic.a -lib/librumpkern_sljit.a -lib/librumpkern_sljit.so -lib/librumpkern_sljit.so.0 -lib/librumpkern_sljit.so.0.0 -lib/librumpkern_sljit_pic.a -lib/librumpkern_sys_linux.a -lib/librumpkern_sys_linux.so -lib/librumpkern_sys_linux.so.0 -lib/librumpkern_sys_linux.so.0.0 -lib/librumpkern_sys_linux_pic.a +%%X8664%%lib/librumpkern_sljit.a +%%X8664%%lib/librumpkern_sljit.so +%%X8664%%lib/librumpkern_sljit.so.0 +%%X8664%%lib/librumpkern_sljit.so.0.0 +%%X8664%%lib/librumpkern_sljit_pic.a +%%X8664%%lib/librumpkern_sys_linux.a +%%X8664%%lib/librumpkern_sys_linux.so +%%X8664%%lib/librumpkern_sys_linux.so.0 +%%X8664%%lib/librumpkern_sys_linux.so.0.0 +%%X8664%%lib/librumpkern_sys_linux_pic.a lib/librumpkern_sysproxy.a lib/librumpkern_sysproxy.so lib/librumpkern_sysproxy.so.0 @@ -315,11 +315,11 @@ lib/librumpnet_agr.so lib/librumpnet_agr.so.0 lib/librumpnet_agr.so.0.0 lib/librumpnet_agr_pic.a -lib/librumpnet_bpfjit.a -lib/librumpnet_bpfjit.so -lib/librumpnet_bpfjit.so.0 -lib/librumpnet_bpfjit.so.0.0 -lib/librumpnet_bpfjit_pic.a +%%X8664%%lib/librumpnet_bpfjit.a +%%X8664%%lib/librumpnet_bpfjit.so +%%X8664%%lib/librumpnet_bpfjit.so.0 +%%X8664%%lib/librumpnet_bpfjit.so.0.0 +%%X8664%%lib/librumpnet_bpfjit_pic.a lib/librumpnet_bridge.a lib/librumpnet_bridge.so lib/librumpnet_bridge.so.0