Commit b7081e3f authored by Mike Hibler's avatar Mike Hibler

Drop linuxthreads for FBSD7 and beyond. Should not be needed anymore.

parent 939e93dc
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006, 2007 University of Utah and the Flux Group.
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -14,15 +14,24 @@ DISTFILES = TODO client.c decls.h event.c event.h log.c log.h \
EXPANDCOPYRIGHT = /usr/site/lib/copyright/expand-copyr
SYSTEM := $(shell uname -s)
# FreeBSD specific goop
ifeq ($(SYSTEM),FreeBSD)
FBSDREL := $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/')
# XXX 5.3 and linuxthreads don't see to get along
ifeq ($(FBSDREL),5.3)
FBSDMAJ := $(basename $(FBSDREL))
WITH_LTHREADS = 0
else
# XXX 5.3 and linuxthreads don't see to get along
# 7.0 and beyond should not need it
ifneq ($(FBSDREL),5.3)
ifneq ($(FBSDMAJ),7)
ifneq ($(FBSDMAJ),8)
WITH_LTHREADS = 1
endif
endif
endif
endif
include $(OBJDIR)/Makeconf
......@@ -41,7 +50,7 @@ ifeq ($(WITH_LTHREADS),1)
PTHREADCFLAGS = -D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads
PTHREADLIBS = -L/usr/local/lib -llthread -llgcc_r
else
PTHREADCFLAGS = -DCONDVARS_WORK
PTHREADCFLAGS = -D_THREAD_SAFE -DCONDVARS_WORK
PTHREADLIBS = -lpthread
endif
endif
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -30,14 +30,17 @@ export HAVE_GCC3 = 1
export HAVE_LOCALE = 1
endif
# XXX 5.3 and linuxthreads don't see to get along
ifeq ($(FBSDREL),5.3)
WITH_LTHREADS = 0
else
# XXX 5.3 and linuxthreads don't see to get along
# 7.0 and beyond should not need it
ifneq ($(FBSDREL),5.3)
ifneq ($(FBSDMAJ),7)
ifneq ($(FBSDMAJ),8)
WITH_LTHREADS = 1
endif
endif
endif
# XXX special checkpoint/shadow device support
WITH_SHD = 0
......@@ -70,7 +73,7 @@ ifeq ($(WITH_LTHREADS),1)
PTHREADCFLAGS = -D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads
PTHREADLIBS = -L/usr/local/lib -llthread -llgcc_r
else
PTHREADCFLAGS = -DCONDVARS_WORK
PTHREADCFLAGS = -D_THREAD_SAFE -DCONDVARS_WORK
PTHREADLIBS = -lpthread
endif
SUBDIRCFLAGS +=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment