Date: Mon, 21 Dec 2015 17:41:09 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292553 - in head: lib usr.sbin Message-ID: <201512211741.tBLHf9Dj037129@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Mon Dec 21 17:41:08 2015 New Revision: 292553 URL: https://svnweb.freebsd.org/changeset/base/292553 Log: Make the building of libsmb and mount_smbfs unconditional, now that r292552 has eliminated alignment and endian problems that were making it fail on some platforms. PR: 180438 PR: 189415 Modified: head/lib/Makefile head/usr.sbin/Makefile head/usr.sbin/Makefile.amd64 head/usr.sbin/Makefile.arm head/usr.sbin/Makefile.i386 head/usr.sbin/Makefile.powerpc head/usr.sbin/Makefile.sparc64 Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Mon Dec 21 17:17:00 2015 (r292552) +++ head/lib/Makefile Mon Dec 21 17:41:08 2015 (r292553) @@ -91,7 +91,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libsbuf \ ${_libsdp} \ ${_libsm} \ - ${_libsmb} \ + libsmb \ ${_libsmdb} \ ${_libsmutil} \ libsqlite3 \ @@ -243,7 +243,6 @@ _libypclnt= libypclnt .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -_libsmb= libsmb _libvgl= libvgl _libproc= libproc _librtld_db= librtld_db @@ -263,15 +262,9 @@ _librtld_db= librtld_db .if ${MACHINE_CPUARCH} == "powerpc" _libproc= libproc _librtld_db= librtld_db -_libsmb= libsmb -.endif - -.if ${MACHINE_CPUARCH} == "sparc64" -_libsmb= libsmb .endif .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" -_libsmb= libsmb _libproc= libproc _librtld_db= librtld_db .endif Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Mon Dec 21 17:17:00 2015 (r292552) +++ head/usr.sbin/Makefile Mon Dec 21 17:41:08 2015 (r292553) @@ -46,6 +46,7 @@ SUBDIR= adduser \ mixer \ mlxcontrol \ mountd \ + mount_smbfs \ mpsutil \ mptutil \ mtest \ Modified: head/usr.sbin/Makefile.amd64 ============================================================================== --- head/usr.sbin/Makefile.amd64 Mon Dec 21 17:17:00 2015 (r292552) +++ head/usr.sbin/Makefile.amd64 Mon Dec 21 17:41:08 2015 (r292553) @@ -25,7 +25,6 @@ SUBDIR+= hyperv .endif SUBDIR+= kgmon SUBDIR+= lptcontrol -SUBDIR+= mount_smbfs SUBDIR+= mptable .if ${MK_NDIS} != "no" SUBDIR+= ndiscvt Modified: head/usr.sbin/Makefile.arm ============================================================================== --- head/usr.sbin/Makefile.arm Mon Dec 21 17:17:00 2015 (r292552) +++ head/usr.sbin/Makefile.arm Mon Dec 21 17:41:08 2015 (r292553) @@ -1,5 +1,4 @@ # $FreeBSD$ SUBDIR+= kgmon -SUBDIR+= mount_smbfs SUBDIR+= ofwdump Modified: head/usr.sbin/Makefile.i386 ============================================================================== --- head/usr.sbin/Makefile.i386 Mon Dec 21 17:17:00 2015 (r292552) +++ head/usr.sbin/Makefile.i386 Mon Dec 21 17:41:08 2015 (r292553) @@ -12,7 +12,6 @@ SUBDIR+= cpucontrol SUBDIR+= kgmon SUBDIR+= kgzip SUBDIR+= lptcontrol -SUBDIR+= mount_smbfs SUBDIR+= mptable .if ${MK_NDIS} != "no" SUBDIR+= ndiscvt Modified: head/usr.sbin/Makefile.powerpc ============================================================================== --- head/usr.sbin/Makefile.powerpc Mon Dec 21 17:17:00 2015 (r292552) +++ head/usr.sbin/Makefile.powerpc Mon Dec 21 17:41:08 2015 (r292553) @@ -1,5 +1,4 @@ # $FreeBSD$ -SUBDIR+= mount_smbfs SUBDIR+= nvram SUBDIR+= ofwdump Modified: head/usr.sbin/Makefile.sparc64 ============================================================================== --- head/usr.sbin/Makefile.sparc64 Mon Dec 21 17:17:00 2015 (r292552) +++ head/usr.sbin/Makefile.sparc64 Mon Dec 21 17:41:08 2015 (r292553) @@ -1,5 +1,4 @@ # $FreeBSD$ SUBDIR+= eeprom -SUBDIR+= mount_smbfs SUBDIR+= ofwdump
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512211741.tBLHf9Dj037129>