diff options
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/archtable | 33 | ||||
| -rw-r--r-- | buildlib/config.h.in | 7 | ||||
| -rw-r--r-- | buildlib/environment.mak.in | 2 | ||||
| -rw-r--r-- | buildlib/ostable | 21 | ||||
| -rw-r--r-- | buildlib/systemtable | 11 |
5 files changed, 3 insertions, 71 deletions
diff --git a/buildlib/archtable b/buildlib/archtable deleted file mode 100644 index eacc9889f..000000000 --- a/buildlib/archtable +++ /dev/null @@ -1,33 +0,0 @@ -# This file contains a table of known architecture strings, with -# things to map them to. `configure' will take the output of the -# autoconf cannon macros and look in here. This only deals with architecture -# (CPU) names. - -# The left side is a regex for awk - -i.86 i386 -pentium i386 -sparc sparc -sparc64 sparc -alpha.* alpha -m68k m68k -arm.*b armeb -arm.* arm -powerpc powerpc -ppc powerpc -powerpc64 ppc64 -mipsel mipsel -mipseb mips -mips mips -sheb sheb -shel sh -sh sh -sh3 sh3 -sh4 sh4 -m32r m32r -hppa.* hppa -ia64 ia64 -s390 s390 -s390x s390x -x86_64 amd64 -# lipa has gnulp-linux-i.86 (see dpkg archtable and ostable) diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 8a65a229a..eddb16246 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -32,11 +32,8 @@ /* If there is no socklen_t, define this for the netdb shim */ #undef NEED_SOCKLEN_T_DEFINE -/* Define the cpu name string */ -#undef COMMON_CPU - -/* Define the on name string */ -#undef COMMON_OS +/* Define the arch name string */ +#undef COMMON_ARCH /* The version number string */ #undef VERSION diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 2d28e1c67..4e47692f5 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -64,7 +64,7 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@ # Shared library things HOST_OS = @host_os@ -ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) +ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu,$(HOST_OS))),0) SONAME_MAGIC=-Wl,-soname -Wl, LFLAGS_SO= else diff --git a/buildlib/ostable b/buildlib/ostable deleted file mode 100644 index ead7d771c..000000000 --- a/buildlib/ostable +++ /dev/null @@ -1,21 +0,0 @@ -# This file contains a table of known vendor-os strings, with -# things to map them to. `configure' will take the output of the -# autoconf cannon macros and look in here. This only deals with -# OS names. The right should be a common name like the arch table -# generates -# The final bit to build the Debian Architecture is done in init.cc -# The left side is a regex for awk, and the first match is used. - -# These are used by Debian -[^-]*-linux-.* linux -[^-]*-kfreebsd.*-gnu kfreebsd -[^-]*-knetbsd.*-gnu knetbsd -[^-]*-gnu[^-]* hurd - -# These are samples. -hp-hpux[^-]* hp-ux -sun-solaris[^-]* solaris -[^-]*-openbsd[^-]* openbsd - -# Catch all -.* unknown diff --git a/buildlib/systemtable b/buildlib/systemtable deleted file mode 100644 index 64c176b50..000000000 --- a/buildlib/systemtable +++ /dev/null @@ -1,11 +0,0 @@ -# This file contains a table of known canonical system strings, with -# things to map them to. `configure' will take the output of the -# autoconf cannon macros and look in here. It will check for -# the full canonical system name (required for e.g. lpia) and if that -# fails it will configure.in will fallback to just checking for the CPU -# in buildlib/archtable - -# The left side is a regex for awk against the canonical system name - -# config.guess reports lpia as i386-unknown-linux-gnulp -i.86-.*-linux-gnulp lpia |