Commit 250a633c authored by Mike Hibler's avatar Mike Hibler

Don't build delay-agent on FreeBSD 8.

Delay agent won't build on FreeBSD 8.x right now due to dummynet API changes.
Not even sure we will bother to fix this since we have a newer, more OS
independent agent.
parent 5ab949d2
......@@ -18,7 +18,14 @@ ifneq ($(SYSTEM),CYGWIN_NT-5.1)
SUBDIRS += trafgen
endif
ifeq ($(SYSTEM),FreeBSD)
SUBDIRS += sched delay-agent stated
FBSDREL := $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/')
FBSDMAJ := $(basename $(FBSDREL))
SUBDIRS += sched stated
ifneq ($(FBSDMAJ),8)
# doesn't build right now due to API changes
SUBDIRS += delay-agent
endif
endif
all: etc-subdir trafgen-fetch all-subdirs
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -23,7 +23,7 @@ endif
SYSTEM := $(shell uname -s)
LIBS = libevent.a
SWIGLIBS =
# Re-entrant, multi-threaded version on FreeBSD, not on Linux or Windows clients.
# Re-entrant, multi-threaded version on FreeBSD and Linux, not on Windows.
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
LIBS += libevent_r.a
SWIGLIBS += event.so _tbevent.so
......
......@@ -151,7 +151,9 @@ event_register_withkeydata_withretry(char *name, int threaded,
unsigned char *keydata, int keylen,
int retrycount)
{
#ifndef __CYGWIN__
extern int pubsub_is_threaded[] __attribute__ ((weak));
#endif
event_handle_t handle;
pubsub_handle_t *server;
......@@ -218,11 +220,15 @@ event_register_withkeydata_withretry(char *name, int threaded,
handle->disconnect = pubsub_disconnect;
#ifdef THREADED
assert(threaded == 1);
#ifndef __CYGWIN__
assert(pubsub_is_threaded != NULL);
#endif
handle->mainloop = NULL; /* no mainloop for mt programs */
#else
assert(threaded == 0);
#ifndef __CYGWIN__
assert(pubsub_is_threaded == NULL);
#endif
handle->mainloop = pubsub_mainloop;
#endif
handle->notify = pubsub_notify;
......
......@@ -100,7 +100,7 @@ control-install: $(INSTALL_SBINDIR)/version0_gateway
install: $(INSTALL_DIR)/opsdir/sbin/version0_gateway
client: evproxy$(EXE) evproxyplab$(EXE)
client: evproxy evproxyplab
client-install: client
$(INSTALL_PROGRAM) evproxy$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/evproxy$(EXE)
$(INSTALL_PROGRAM) evproxyplab$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/evproxy_shared$(EXE)
......
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