From 2c01980d4eadf848e82f738a59c375be4f57abe3 Mon Sep 17 00:00:00 2001 From: "Jonathan A. Kollasch" Date: Thu, 21 Apr 2011 10:20:55 -0500 Subject: [PATCH] Fix build of user-space on nbsd50 and greater Reviewed-on: http://gerrit.openafs.org/4509 Tested-by: BuildBot Tested-by: Jonathan A. Kollasch Reviewed-by: Derrick Brashear (cherry picked from commit da3ee813960d90ea83851c47fbd59eb3012c7904) Change-Id: If5d8b7e2edd3a8b6ff3cec97800900011fb6ea90 Reviewed-on: http://gerrit.openafs.org/5423 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- Makefile.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8ceb29ae2..f1995c769 100644 --- a/Makefile.in +++ b/Makefile.in @@ -219,7 +219,7 @@ ubik: cmd comerr auth ubik_depinstall sys tubik: ubik libafsrpc +[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ + alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} tubik ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ echo Not building MT ubik for ${SYS_NAME} ;; \ @@ -236,7 +236,7 @@ ptserver: cmd comerr ubik cmd comerr auth audit ptserver_depinstall tptserver: cmd comerr ptserver tubik libafsrpc libafsauthent +[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ + alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} tptserver ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ echo Not building MT ptserver for ${SYS_NAME} ;; \ @@ -284,7 +284,7 @@ vlserver: cmd comerr vol audit vlserver_depinstall tvlserver: cmd comerr vol audit tubik libafsrpc libafsauthent tvlserver_depinstall +[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ + alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} tvlserver ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ echo Not building MT tvlserver for ${SYS_NAME} ;; \ @@ -300,7 +300,7 @@ viced: cmd comerr vlserver tvlserver audit tviced: cmd comerr viced vlserver tvlserver libafsrpc libafsauthent +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*|*_darwin_*) \ + alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ ${COMPILE_PART1} tviced ${COMPILE_PART2} ;; \ *) \ echo Not building MT viced for ${SYS_NAME} ;; \ @@ -308,7 +308,7 @@ tviced: cmd comerr viced vlserver tvlserver libafsrpc libafsauthent dviced: cmd comerr viced vlserver tvlserver libafsrpc libafsauthent +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*|*_darwin_*) \ + alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \ ${COMPILE_PART1} dviced ${COMPILE_PART2} ;; \ *) \ echo Not building DAFS viced for ${SYS_NAME} ;; \ @@ -551,7 +551,7 @@ budb: cmd comerr bubasics uss tbudb: budb tubik +[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ + alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} tbudb ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ echo Not building MT budb for ${SYS_NAME} ;; \ @@ -580,7 +580,7 @@ tests: rxtests ubiktests rpctestlib # pthread based user space RX library libafsrpc: rx rxkad rxstat fsint des +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ + alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} libafsrpc ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ echo Not building MT libafsrpc for ${SYS_NAME} ;; \ @@ -592,7 +592,7 @@ libafsrpc: rx rxkad rxstat fsint des libafsauthent: ubik auth kauth libafsrpc +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \ + alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} libafsauthent ${COMPILE_PART2} ;; \ *_darwin_[1-6][0-9]) \ echo Not building MT libafsauthent for ${SYS_NAME} ;; \ -- 2.39.5