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
This commit is contained in:
Ian Lepore 2015-12-21 17:41:08 +00:00
parent 69ba629255
commit 91ee346313
7 changed files with 2 additions and 13 deletions

View File

@ -91,7 +91,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
libsbuf \ libsbuf \
${_libsdp} \ ${_libsdp} \
${_libsm} \ ${_libsm} \
${_libsmb} \ libsmb \
${_libsmdb} \ ${_libsmdb} \
${_libsmutil} \ ${_libsmutil} \
libsqlite3 \ libsqlite3 \
@ -243,7 +243,6 @@ _libypclnt= libypclnt
.endif .endif
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
_libsmb= libsmb
_libvgl= libvgl _libvgl= libvgl
_libproc= libproc _libproc= libproc
_librtld_db= librtld_db _librtld_db= librtld_db
@ -263,15 +262,9 @@ _librtld_db= librtld_db
.if ${MACHINE_CPUARCH} == "powerpc" .if ${MACHINE_CPUARCH} == "powerpc"
_libproc= libproc _libproc= libproc
_librtld_db= librtld_db _librtld_db= librtld_db
_libsmb= libsmb
.endif
.if ${MACHINE_CPUARCH} == "sparc64"
_libsmb= libsmb
.endif .endif
.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
_libsmb= libsmb
_libproc= libproc _libproc= libproc
_librtld_db= librtld_db _librtld_db= librtld_db
.endif .endif

View File

@ -46,6 +46,7 @@ SUBDIR= adduser \
mixer \ mixer \
mlxcontrol \ mlxcontrol \
mountd \ mountd \
mount_smbfs \
mpsutil \ mpsutil \
mptutil \ mptutil \
mtest \ mtest \

View File

@ -25,7 +25,6 @@ SUBDIR+= hyperv
.endif .endif
SUBDIR+= kgmon SUBDIR+= kgmon
SUBDIR+= lptcontrol SUBDIR+= lptcontrol
SUBDIR+= mount_smbfs
SUBDIR+= mptable SUBDIR+= mptable
.if ${MK_NDIS} != "no" .if ${MK_NDIS} != "no"
SUBDIR+= ndiscvt SUBDIR+= ndiscvt

View File

@ -1,5 +1,4 @@
# $FreeBSD$ # $FreeBSD$
SUBDIR+= kgmon SUBDIR+= kgmon
SUBDIR+= mount_smbfs
SUBDIR+= ofwdump SUBDIR+= ofwdump

View File

@ -12,7 +12,6 @@ SUBDIR+= cpucontrol
SUBDIR+= kgmon SUBDIR+= kgmon
SUBDIR+= kgzip SUBDIR+= kgzip
SUBDIR+= lptcontrol SUBDIR+= lptcontrol
SUBDIR+= mount_smbfs
SUBDIR+= mptable SUBDIR+= mptable
.if ${MK_NDIS} != "no" .if ${MK_NDIS} != "no"
SUBDIR+= ndiscvt SUBDIR+= ndiscvt

View File

@ -1,5 +1,4 @@
# $FreeBSD$ # $FreeBSD$
SUBDIR+= mount_smbfs
SUBDIR+= nvram SUBDIR+= nvram
SUBDIR+= ofwdump SUBDIR+= ofwdump

View File

@ -1,5 +1,4 @@
# $FreeBSD$ # $FreeBSD$
SUBDIR+= eeprom SUBDIR+= eeprom
SUBDIR+= mount_smbfs
SUBDIR+= ofwdump SUBDIR+= ofwdump