Commit 2eced70b authored by Mike Hibler's avatar Mike Hibler

Changes to build under FreeBSD 9.

parent 4cae9129
......@@ -15,15 +15,19 @@ SUBDIRS = program-agent link-agent tevc proxy linktest
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
SUBDIRS += trafgen
endif
ifeq ($(SYSTEM),FreeBSD)
ifeq ($(WITH_EMULAB),1)
# only in a full build for now.
ifeq ($(SYSTEM),FreeBSD)
FBSDREL := $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/')
FBSDMAJ := $(basename $(FBSDREL))
ifneq ($(FBSDMAJ),8)
ifneq ($(FBSDMAJ),9)
# doesn't build right now due to API changes
SUBDIRS += delay-agent
endif
endif
endif
endif
all: trafgen-fetch all-subdirs
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2000-2004 University of Utah and the Flux Group.
* Copyright (c) 2000-2011 University of Utah and the Flux Group.
* All rights reserved.
*/
......@@ -30,7 +30,6 @@
#include <netdb.h>
#include <signal.h>
#include <syslog.h>
#include <utmp.h>
#ifdef __linux__
#include <net/if.h>
......
......@@ -89,6 +89,9 @@ endif
ifeq ($(MDSUBDIR),freebsd8)
MDSUBDIR = freebsd7
endif
ifeq ($(MDSUBDIR),freebsd9)
MDSUBDIR = freebsd7
endif
endif
ifeq ($(SYSTEM),Cygwin)
......
#
# Insert Copyright Here.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf
all:
client: init
include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT -DTESTBED
init: init.c pathnames.h
$(CC) $(CFLAGS) -static -o init $< -lutil -lcrypt
install:
client-install: client
install -s -o root -g wheel -m 555 -b -B.bak -fschg -S init $(DESTDIR)/sbin/init
clean:
rm -f *.o core init
This diff is collapsed.
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Donn Seeley at Berkeley Software Design, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)pathnames.h 8.1 (Berkeley) 6/5/93
* $FreeBSD: src/sbin/init/pathnames.h,v 1.3 2004/04/09 19:58:30 markm Exp $
*/
#include <paths.h>
#define _PATH_SLOGGER "/sbin/session_logger"
#define _PATH_RUNCOM "/etc/rc"
#define _PATH_RUNDOWN "/etc/rc.shutdown"
......@@ -28,6 +28,9 @@ endif
ifeq ($(FBSDVERSION),FreeBSD8)
FSUBDIR = 8
endif
ifeq ($(FBSDVERSION),FreeBSD9)
FSUBDIR = 9
endif
SUBDIRS = $(FSUBDIR)
all:
......
......@@ -22,10 +22,12 @@ FBSDREL := $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/')
FBSDMAJ := $(basename $(FBSDREL))
ifneq ($(FBSDMAJ),7)
ifneq ($(FBSDMAJ),8)
ifneq ($(FBSDMAJ),9)
WITH_LTHREADS = 1
endif
endif
endif
endif
ifeq ($(WITH_LTHREADS),1)
PTHREADCFLAGS += -D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads
......
......@@ -7396,6 +7396,7 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/tmcc/freebsd/init/6/GNUmakefile \
clientside/tmcc/freebsd/init/7/GNUmakefile \
clientside/tmcc/freebsd/init/8/GNUmakefile \
clientside/tmcc/freebsd/init/9/GNUmakefile \
clientside/tmcc/freebsd/supfile clientside/tmcc/freebsd/sethostname \
clientside/tmcc/linux/GNUmakefile clientside/tmcc/linux/supfile \
clientside/tmcc/linux/sethostname.dhclient \
......
......@@ -1117,6 +1117,7 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/tmcc/freebsd/init/6/GNUmakefile \
clientside/tmcc/freebsd/init/7/GNUmakefile \
clientside/tmcc/freebsd/init/8/GNUmakefile \
clientside/tmcc/freebsd/init/9/GNUmakefile \
clientside/tmcc/freebsd/supfile clientside/tmcc/freebsd/sethostname \
clientside/tmcc/linux/GNUmakefile clientside/tmcc/linux/supfile \
clientside/tmcc/linux/sethostname.dhclient \
......
......@@ -16,8 +16,6 @@ SYSTEM := $(shell uname -s)
SUBDIRS = proxy example
ifeq ($(SYSTEM),FreeBSD)
FBSDREL := $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/')
FBSDMAJ := $(basename $(FBSDREL))
SUBDIRS += sched stated
ifeq ($(ISMAINSITE),1)
SUBDIRS += new_sched
......
......@@ -34,11 +34,13 @@ WITH_LTHREADS = 0
ifneq ($(FBSDREL),5.3)
ifneq ($(FBSDMAJ),7)
ifneq ($(FBSDMAJ),8)
ifneq ($(FBSDMAJ),9)
WITH_LTHREADS = 1
endif
endif
endif
endif
endif
WITH_MSERVER_NULL = 1
WITH_MSERVER_EMULAB = 1
......
......@@ -49,11 +49,13 @@ WITH_LTHREADS = 0
ifneq ($(FBSDREL),5.3)
ifneq ($(FBSDMAJ),7)
ifneq ($(FBSDMAJ),8)
ifneq ($(FBSDMAJ),9)
WITH_LTHREADS = 1
endif
endif
endif
endif
endif
# Linux specific goop
ifeq ($(SYSTEM),Linux)
......
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