idolpx/fsp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons can link against efence too

Browse Source
This commit is contained in:
hsn 2007-07-25 17:15:11 +00:00
parent 62941b3a00
commit 8db73956a7
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -13,13 +13,15 @@ Version NEXT
MTU changed from 1500 to 1492 for better operation on pppOE networks MTU changed from 1500 to 1492 for better operation on pppOE networks
Max payload changed from 4096 to 4380 bytes (3 packets) Max payload changed from 4096 to 4380 bytes (3 packets)
fspd: command line argument now overrides config file fspd: command line argument now overrides config file
updated year in copyright (todo!!) updated year in copyright
fsetup command added to setup.sh fsetup command added to setup.sh
fsetup command added to setup.csh fsetup command added to setup.csh
fcd: remove trailing \r\n from readme file fcd: remove trailing \r\n from readme file
fcd: do not print empty line after directory protection fcd: do not print empty line after directory protection
fsetupcmd: don't crash if called with numeric address fsetupcmd: don't crash if called with numeric address
fspscan: commited fix by Yang Hong fspscan: commited fix by Yang Hong
SCONS: turning on maintainer-mode links against efence (if possible)
same thing like ./configure do
Version 2.8.1b24 - 19 Feb 2005 Version 2.8.1b24 - 19 Feb 2005
use getopt from stdio.h instead of getopt.h in fspscan.c use getopt from stdio.h instead of getopt.h in fspscan.c

10
SConstruct
View File

@ -6,8 +6,9 @@ EnsureSConsVersion(0,96)
PREFIX='/usr/local' PREFIX='/usr/local'
PACKAGE='fsp' PACKAGE='fsp'
VERSION='2.8.1b25' VERSION='2.8.1b25'
EFENCE=0
env = Environment(CPPPATH='#/include') env = Environment(CPPPATH='#/include', LIBPATH=['/usr/lib','/usr/local/lib'])
# Turn CPPFLAGS to list # Turn CPPFLAGS to list
env.Append( CPPFLAGS = []) env.Append( CPPFLAGS = [])
@ -56,15 +57,18 @@ void dummy(void) {}
# check for maintainer mode # check for maintainer mode
def checkForMaintainerMode(conf): def checkForMaintainerMode(conf):
global EFENCE
conf.Message("checking whether to enable maintainer mode... ") conf.Message("checking whether to enable maintainer mode... ")
if ARGUMENTS.get('maintainer-mode', 0) or \ if ARGUMENTS.get('maintainer-mode', 0) or \
ARGUMENTS.get('enable-maintainer-mode', 0): ARGUMENTS.get('enable-maintainer-mode', 0):
conf.Result(1) conf.Result(1)
conf.env.Append(CCFLAGS = '-O0') conf.env.Append(CCFLAGS = '-O0')
conf.env.Append(CPPFLAGS = '-DMAINTAINER_MODE') conf.env.Append(CPPFLAGS = '-DMAINTAINER_MODE')
EFENCE=1
else: else:
conf.env.Append(CCFLAGS = '-O')
conf.Result(0) conf.Result(0)
conf.env.Append(CCFLAGS = '-O')
EFENCE=0
# check for user-supplied lock prefix # check for user-supplied lock prefix
def checkForLockPrefix(conf): def checkForLockPrefix(conf):
@ -196,6 +200,8 @@ conf.checkForLockPrefix()
conf.checkPrefix() conf.checkPrefix()
conf.env.Append(CPPFLAGS = '-DSYSCONFDIR=\\"'+PREFIX+'/etc\\"') conf.env.Append(CPPFLAGS = '-DSYSCONFDIR=\\"'+PREFIX+'/etc\\"')
conf.MAINTAINER_MODE() conf.MAINTAINER_MODE()
if EFENCE == 1:
EFENCE=conf.CheckLib("efence","EF_Abort")
conf.Finish() conf.Finish()
#configure globals #configure globals