update for affinity and solaris build