build: clean up sitefiles, make them per-arch

Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45090
2015-03-28 13:38:34 +00:00
parent 693e5aae41
commit 74ca7e9af3
65 changed files with 33 additions and 264 deletions
--- a/6
+++ b/6
@@ -75,10 +75,10 @@ endif

 # check prerequisites before starting to build
 prereq: $(target/stamp-prereq) tmp/.prereq_packages
-	@if [ ! -f "$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)" ]; then \
-		echo 'ERROR: Missing site config for target "$(REAL_GNU_TARGET_NAME)" !'; \
+	@if [ ! -f "$(INCLUDE_DIR)/site/$(ARCH)" ]; then \
+		echo 'ERROR: Missing site config for architecture "$(ARCH)" !'; \
 		echo '       The missing file will cause configure scripts to fail during compilation.'; \
-		echo '       Please provide a "$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)" file and restart the build.'; \
+		echo '       Please provide a "$(INCLUDE_DIR)/site/$(ARCH)" file and restart the build.'; \
 		exit 1; \
 	fi

--- a/include/package.mk
+++ b/include/package.mk
@@ -127,7 +127,7 @@ include $(INCLUDE_DIR)/package-bin.mk
 include $(INCLUDE_DIR)/autotools.mk

 override MAKEFLAGS=
-CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
+CONFIG_SITE:=$(INCLUDE_DIR)/site/$(ARCH)
 CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
 SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
 PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig
--- a/include/site/aarch64-linux
+++ b/include/site/aarch64-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}

--- a/include/site/aarch64-openwrt-linux-gnu
+++ b/include/site/aarch64-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/aarch64-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/mips64-linux
+++ b/include/site/mips64-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}

--- a/include/site/aarch64_be-openwrt-linux-gnu
+++ b/include/site/aarch64_be-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/aarch64-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/i686-linux
+++ b/include/site/i686-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}

--- a/include/site/arm-openwrt-linux-gnu
+++ b/include/site/arm-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/arm-openwrt-linux-gnueabi
+++ b/include/site/arm-openwrt-linux-gnueabi
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/arm-openwrt-linux-musl
+++ b/include/site/arm-openwrt-linux-musl
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/arm-openwrt-linux-muslgnueabi
+++ b/include/site/arm-openwrt-linux-muslgnueabi
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/arm-openwrt-linux-uclibc
+++ b/include/site/arm-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/arm-openwrt-linux-uclibcgnueabi
+++ b/include/site/arm-openwrt-linux-uclibcgnueabi
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/sparc-linux
+++ b/include/site/sparc-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}

--- a/include/site/armeb-openwrt-linux-gnu
+++ b/include/site/armeb-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/armeb-openwrt-linux-gnueabi
+++ b/include/site/armeb-openwrt-linux-gnueabi
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/armeb-openwrt-linux-musl
+++ b/include/site/armeb-openwrt-linux-musl
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/armeb-openwrt-linux-muslgnueabi
+++ b/include/site/armeb-openwrt-linux-muslgnueabi
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/armeb-openwrt-linux-uclibc
+++ b/include/site/armeb-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/armeb-openwrt-linux-uclibcgnueabi
+++ b/include/site/armeb-openwrt-linux-uclibcgnueabi
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/arm-linux
+++ b/include/site/arm-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}

--- a/include/site/i486-openwrt-linux-gnu
+++ b/include/site/i486-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i486-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/i486-openwrt-linux-musl
+++ b/include/site/i486-openwrt-linux-musl
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i486-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/i486-openwrt-linux-uclibc
+++ b/include/site/i486-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i486-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/i686
+++ b/include/site/i686
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $TOPDIR/include/site/i486
+
--- a/include/site/i686-openwrt-linux-gnu
+++ b/include/site/i686-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i686-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/i686-openwrt-linux-musl
+++ b/include/site/i686-openwrt-linux-musl
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i686-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/i686-openwrt-linux-uclibc
+++ b/include/site/i686-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i686-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/linux-gnu
+++ b/include/site/linux-gnu
@@ -1 +0,0 @@
-. $TOPDIR/include/site/linux
--- a/include/site/linux-uclibc
+++ b/include/site/linux-uclibc
@@ -1 +0,0 @@
-. $TOPDIR/include/site/linux
--- a/include/site/m68k-linux
+++ b/include/site/m68k-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}

--- a/include/site/m68k-openwrt-linux-gnu
+++ b/include/site/m68k-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/m68k-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/m68k-openwrt-linux-uclibc
+++ b/include/site/m68k-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/m68k-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/mips-linux
+++ b/include/site/mips-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}

--- a/include/site/mips-linux-gnu
+++ b/include/site/mips-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/mips-openwrt-linux-gnu
+++ b/include/site/mips-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/mips-openwrt-linux-musl
+++ b/include/site/mips-openwrt-linux-musl
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/mips-openwrt-linux-uclibc
+++ b/include/site/mips-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/aarch64_be-linux
+++ b/include/site/aarch64_be-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}

--- a/include/site/mips64-openwrt-linux-gnu
+++ b/include/site/mips64-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/mips64-openwrt-linux-uclibc
+++ b/include/site/mips64-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/mips64el-linux
+++ b/include/site/mips64el-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}

--- a/include/site/mips64el-openwrt-linux-gnu
+++ b/include/site/mips64el-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/mips64el-openwrt-linux-uclibc
+++ b/include/site/mips64el-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/i486-linux
+++ b/include/site/i486-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}

--- a/include/site/mipsel-linux
+++ b/include/site/mipsel-linux
@@ -1,28 +0,0 @@
-ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
-ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
-
-ac_cv_sizeof___int64=0
-ac_cv_sizeof_char=1
-ac_cv_sizeof_int=4
-ac_cv_sizeof_int16_t=2
-ac_cv_sizeof_int32_t=4
-ac_cv_sizeof_int64_t=8
-ac_cv_sizeof_long_int=4
-ac_cv_sizeof_long_long=8
-ac_cv_sizeof_long=4
-ac_cv_sizeof_off_t=8
-ac_cv_sizeof_short_int=2
-ac_cv_sizeof_short=2
-ac_cv_sizeof_size_t=4
-ac_cv_sizeof_ssize_t=4
-ac_cv_sizeof_u_int16_t=2
-ac_cv_sizeof_u_int32_t=4
-ac_cv_sizeof_u_int64_t=8
-ac_cv_sizeof_uint16_t=2
-ac_cv_sizeof_uint32_t=4
-ac_cv_sizeof_uint64_t=8
-ac_cv_sizeof_unsigned_int=4
-ac_cv_sizeof_unsigned_long=4
-ac_cv_sizeof_unsigned_long_long=8
-ac_cv_sizeof_unsigned_short=2
-ac_cv_sizeof_void_p=4
--- a/include/site/mipsel-linux-gnu
+++ b/include/site/mipsel-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/mipsel-openwrt-linux-gnu
+++ b/include/site/mipsel-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/mipsel-openwrt-linux-musl
+++ b/include/site/mipsel-openwrt-linux-musl
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/mipsel-openwrt-linux-uclibc
+++ b/include/site/mipsel-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/mipsel-openwrt-linux2.4-uclibc
+++ b/include/site/mipsel-openwrt-linux2.4-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-uclibc
-ac_cv_header_sys_inotify_h=no
--- a/include/site/powerpc-linux
+++ b/include/site/powerpc-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}

--- a/include/site/powerpc-openwrt-linux-gnu
+++ b/include/site/powerpc-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/powerpc-openwrt-linux-gnuspe
+++ b/include/site/powerpc-openwrt-linux-gnuspe
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/powerpc-openwrt-linux-musl
+++ b/include/site/powerpc-openwrt-linux-musl
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/powerpc-openwrt-linux-uclibc
+++ b/include/site/powerpc-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/powerpc-openwrt-linux-uclibcspe
+++ b/include/site/powerpc-openwrt-linux-uclibcspe
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/armeb-linux
+++ b/include/site/armeb-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}

--- a/include/site/sparc-linux-gnu
+++ b/include/site/sparc-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/sparc-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/sparc-openwrt-linux-gnu
+++ b/include/site/sparc-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/sparc-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/sparc-openwrt-linux-uclibc
+++ b/include/site/sparc-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/sparc-linux
-. $TOPDIR/include/site/linux
-
--- a/include/site/x86_64-linux
+++ b/include/site/x86_64-linux
@@ -1,3 +1,5 @@
+#!/bin/sh
+. $TOPDIR/include/site/linux
 ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=no}

--- a/include/site/x86_64-openwrt-linux-gnu
+++ b/include/site/x86_64-openwrt-linux-gnu
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/x86_64-linux
-. $TOPDIR/include/site/linux-gnu
-
--- a/include/site/x86_64-openwrt-linux-musl
+++ b/include/site/x86_64-openwrt-linux-musl
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/x86_64-linux
-. $TOPDIR/include/site/linux-uclibc
-
--- a/include/site/x86_64-openwrt-linux-uclibc
+++ b/include/site/x86_64-openwrt-linux-uclibc
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/x86_64-linux
-. $TOPDIR/include/site/linux-uclibc
-