From 4f0f217c1b6a8c888ff8a1c60d1eb36cbdf14490 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Sat, 26 May 2007 18:15:22 -0700 Subject: Get rid of GNU libelf and its autoconf nastiness and replace it with FreeBSD's implementation --HG-- extra : convert_revision : ef9c4551b9a6b54b76a89f286ff9804c55790621 --- ext/libelf/SConscript | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 ext/libelf/SConscript (limited to 'ext/libelf/SConscript') diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript new file mode 100644 index 000000000..e909279d2 --- /dev/null +++ b/ext/libelf/SConscript @@ -0,0 +1,103 @@ +# -*- mode:python -*- + +# Copyright (c) 2004-2005 The Regents of The University of Michigan +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer; +# 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; +# neither the name of the copyright holders 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 COPYRIGHT HOLDERS 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 COPYRIGHT +# OWNER 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. +# +# Authors: Nathan Binkert + +import os + +Import('env') + +elf_files = [] +def ElfFile(filename): + elf_files.append(File(filename)) + +ElfFile('elf_begin.c') +ElfFile('elf_cntl.c') +ElfFile('elf_data.c') +ElfFile('elf_end.c') +ElfFile('elf_fill.c') +ElfFile('elf_flag.c') +ElfFile('elf_getarhdr.c') +ElfFile('elf_getarsym.c') +ElfFile('elf_getbase.c') +ElfFile('elf_getident.c') +ElfFile('elf_hash.c') +ElfFile('elf_kind.c') +ElfFile('elf_memory.c') +ElfFile('elf_next.c') +ElfFile('elf_phnum.c') +ElfFile('elf_rand.c') +ElfFile('elf_rawfile.c') +ElfFile('elf_scn.c') +ElfFile('elf_shnum.c') +ElfFile('elf_shstrndx.c') +ElfFile('elf_strptr.c') +ElfFile('elf_update.c') +ElfFile('elf_version.c') +ElfFile('gelf_checksum.c') +ElfFile('gelf_dyn.c') +ElfFile('gelf_ehdr.c') +ElfFile('gelf_fsize.c') +ElfFile('gelf_getclass.c') +ElfFile('gelf_phdr.c') +ElfFile('gelf_rel.c') +ElfFile('gelf_rela.c') +ElfFile('gelf_shdr.c') +ElfFile('gelf_sym.c') +ElfFile('gelf_symshndx.c') +ElfFile('gelf_xlate.c') +ElfFile('libelf.c') +ElfFile('libelf_align.c') +ElfFile('libelf_allocate.c') +ElfFile('libelf_ar.c') +ElfFile('libelf_checksum.c') +ElfFile('libelf_data.c') +ElfFile('libelf_ehdr.c') +ElfFile('libelf_extended.c') +ElfFile('libelf_phdr.c') +ElfFile('libelf_shdr.c') +ElfFile('libelf_xlate.c') + +ElfFile('libelf_convert.c') +ElfFile('libelf_fsize.c') +ElfFile('libelf_msize.c') + +m4env = Environment(ENV=os.environ) +m4env.Append(M4FLAGS='-DSRCDIR=%s' % Dir('.')) +m4env['M4COM'] = 'cd ${SOURCE.rsrcdir} && $M4 $M4FLAGS $SOURCES > ${TARGET.abspath}' +m4env.M4(target=File('libelf_convert.c'), + source=[File('elf_types.m4'), File('libelf_convert.m4')]) +m4env.M4(target=File('libelf_fsize.c'), + source=[File('elf_types.m4'), File('libelf_fsize.m4')]) +m4env.M4(target=File('libelf_msize.c'), + source=[File('elf_types.m4'), File('libelf_msize.m4')]) +m4env.Library('elf', elf_files) + +env.Append(CPPPATH=Dir('.')) +env.Append(LIBS=['elf']) +env.Append(LIBPATH=[Dir('.')]) -- cgit v1.2.3 From 8dfd7f98045b734920db0c34b14e9f25307f22c0 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Mon, 28 May 2007 18:39:35 -0400 Subject: Fix M4 command line... wasn't working on zizzer. A little more concise now. --HG-- extra : convert_revision : 5cb46832ac7ce7a0be72765e83c8ceb5d8d4b64a --- ext/libelf/SConscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/libelf/SConscript') diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript index e909279d2..2fae8c25f 100644 --- a/ext/libelf/SConscript +++ b/ext/libelf/SConscript @@ -88,8 +88,8 @@ ElfFile('libelf_fsize.c') ElfFile('libelf_msize.c') m4env = Environment(ENV=os.environ) -m4env.Append(M4FLAGS='-DSRCDIR=%s' % Dir('.')) -m4env['M4COM'] = 'cd ${SOURCE.rsrcdir} && $M4 $M4FLAGS $SOURCES > ${TARGET.abspath}' +m4env.Append(M4FLAGS='-DSRCDIR=%s' % Dir('.').path) +m4env['M4COM'] = '$M4 $M4FLAGS $SOURCES > $TARGET' m4env.M4(target=File('libelf_convert.c'), source=[File('elf_types.m4'), File('libelf_convert.m4')]) m4env.M4(target=File('libelf_fsize.c'), -- cgit v1.2.3 From 0193476ea790963884059c27d7fdd607a6f79019 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Wed, 30 May 2007 17:08:12 -0400 Subject: Fix compiling on Solaris since Nate's libelf change SConstruct: export env after we've set CC/CXX ext/libelf/SConscript: pull in the CC/CXX variables from env. Use gm4 if it exists ext/libelf/elf_begin.c: ext/libelf/libelf_allocate.c: include errno.h instead of sys/errno.h ext/libelf/elf_common.h: use the more standard uintX_t ext/libelf/elf_strptr.c: ext/libelf/elf_update.c: include sysmacros.h on Solaris for roundup() --HG-- extra : convert_revision : ea1aab834029399c445dfa4c9f78febf2c3d8f0c --- ext/libelf/SConscript | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'ext/libelf/SConscript') diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript index 2fae8c25f..aebd0da85 100644 --- a/ext/libelf/SConscript +++ b/ext/libelf/SConscript @@ -28,7 +28,7 @@ # # Authors: Nathan Binkert -import os +import os, subprocess Import('env') @@ -88,6 +88,15 @@ ElfFile('libelf_fsize.c') ElfFile('libelf_msize.c') m4env = Environment(ENV=os.environ) +if env.get('CC'): + m4env['CC'] = env['CC'] +if env.get('CXX'): + m4env['CXX'] = env['CXX'] +# If we have gm4 use it +if subprocess.Popen("gm4 --version", shell=True, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, close_fds=True).communicate()[0].find('GNU') >= 0: + m4env['M4'] = 'gm4' + m4env.Append(M4FLAGS='-DSRCDIR=%s' % Dir('.').path) m4env['M4COM'] = '$M4 $M4FLAGS $SOURCES > $TARGET' m4env.M4(target=File('libelf_convert.c'), @@ -101,3 +110,4 @@ m4env.Library('elf', elf_files) env.Append(CPPPATH=Dir('.')) env.Append(LIBS=['elf']) env.Append(LIBPATH=[Dir('.')]) + -- cgit v1.2.3 From 473bf1a66a3e89659fe46b547d380c65073a5e7c Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Thu, 31 May 2007 15:33:17 -0400 Subject: check that m4 is available before trying to use it --HG-- extra : convert_revision : 8d4d75451fc003e3843e306008ad0632bbf0217a --- ext/libelf/SConscript | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ext/libelf/SConscript') diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript index aebd0da85..d6f1e351b 100644 --- a/ext/libelf/SConscript +++ b/ext/libelf/SConscript @@ -92,11 +92,17 @@ if env.get('CC'): m4env['CC'] = env['CC'] if env.get('CXX'): m4env['CXX'] = env['CXX'] + # If we have gm4 use it if subprocess.Popen("gm4 --version", shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True).communicate()[0].find('GNU') >= 0: m4env['M4'] = 'gm4' +# Check that m4 is available +if not m4env.get('M4'): + print "Error: Can't find version of M4 macro processor. Please install M4 and try again." + Exit(1) + m4env.Append(M4FLAGS='-DSRCDIR=%s' % Dir('.').path) m4env['M4COM'] = '$M4 $M4FLAGS $SOURCES > $TARGET' m4env.M4(target=File('libelf_convert.c'), -- cgit v1.2.3 From 6b6de8aaae86ea8b0f416a175c547fc67bea804a Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 31 May 2007 13:45:03 -0700 Subject: obey the m5 style --HG-- extra : convert_revision : ac0d55c651a2bb6823cbf5a31c6f57ec163730ab --- ext/libelf/SConscript | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ext/libelf/SConscript') diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript index d6f1e351b..7affa6dcb 100644 --- a/ext/libelf/SConscript +++ b/ext/libelf/SConscript @@ -94,13 +94,15 @@ if env.get('CXX'): m4env['CXX'] = env['CXX'] # If we have gm4 use it -if subprocess.Popen("gm4 --version", shell=True, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, close_fds=True).communicate()[0].find('GNU') >= 0: +subp = subprocess.Popen("gm4 --version", shell=True, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, close_fds=True) +if subp.communicate()[0].find('GNU') >= 0: m4env['M4'] = 'gm4' # Check that m4 is available if not m4env.get('M4'): - print "Error: Can't find version of M4 macro processor. Please install M4 and try again." + print "Error: Can't find version of M4 macro processor. " + \ + "Please install M4 and try again." Exit(1) m4env.Append(M4FLAGS='-DSRCDIR=%s' % Dir('.').path) -- cgit v1.2.3