build: clean up sitefiles, make them per-arch

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 45090

Makefile

@@ -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
 

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

include/site/aarch64-linux → include/site/aarch64

@@ -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}
 

include/site/aarch64-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/aarch64-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/mips64-linux → include/site/aarch64_be

@@ -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}
 

include/site/aarch64_be-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/aarch64-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/i686-linux → include/site/arm

@@ -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}
 

include/site/arm-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/arm-openwrt-linux-gnueabi

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/arm-openwrt-linux-musl

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/arm-openwrt-linux-muslgnueabi

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/arm-openwrt-linux-uclibc

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/arm-openwrt-linux-uclibcgnueabi

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/arm-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/sparc-linux → include/site/armeb

@@ -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}
 

include/site/armeb-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/armeb-openwrt-linux-gnueabi

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/armeb-openwrt-linux-musl

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/armeb-openwrt-linux-muslgnueabi

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/armeb-openwrt-linux-uclibc

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/armeb-openwrt-linux-uclibcgnueabi

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/armeb-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/arm-linux → include/site/i486

@@ -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}
 

include/site/i486-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i486-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/i486-openwrt-linux-musl

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i486-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/i486-openwrt-linux-uclibc

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i486-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/i686

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $TOPDIR/include/site/i486
+

include/site/i686-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i686-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/i686-openwrt-linux-musl

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i686-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/i686-openwrt-linux-uclibc

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/i686-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/linux-gnu

@@ -1 +0,0 @@
-. $TOPDIR/include/site/linux

include/site/linux-uclibc

@@ -1 +0,0 @@
-. $TOPDIR/include/site/linux

include/site/m68k-linux → include/site/m68k

@@ -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}
 

include/site/m68k-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/m68k-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/m68k-openwrt-linux-uclibc

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/m68k-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/mips-linux → include/site/mips

@@ -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}
 

include/site/mips-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/mips-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/mips-openwrt-linux-musl

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/mips-openwrt-linux-uclibc

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/aarch64_be-linux → include/site/mips64

@@ -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}
 

include/site/mips64-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/mips64-openwrt-linux-uclibc

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/mips64el-linux → include/site/mips64el

@@ -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}
 

include/site/mips64el-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/mips64el-openwrt-linux-uclibc

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mips64-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/i486-linux → include/site/mipsel

@@ -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}
 

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

include/site/mipsel-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/mipsel-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/mipsel-openwrt-linux-musl

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/mipsel-openwrt-linux-uclibc

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/mipsel-linux
-. $TOPDIR/include/site/linux-uclibc
-

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

include/site/powerpc-linux → include/site/powerpc

@@ -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}
 

include/site/powerpc-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/powerpc-openwrt-linux-gnuspe

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/powerpc-openwrt-linux-musl

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/powerpc-openwrt-linux-uclibc

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/powerpc-openwrt-linux-uclibcspe

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/powerpc-linux
-. $TOPDIR/include/site/linux-uclibc
-

include/site/armeb-linux → include/site/sparc

@@ -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}
 

include/site/sparc-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/sparc-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/sparc-openwrt-linux-gnu

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/sparc-linux
-. $TOPDIR/include/site/linux-gnu
-

include/site/sparc-openwrt-linux-uclibc

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/sparc-linux
-. $TOPDIR/include/site/linux
-

include/site/x86_64-linux → include/site/x86_64

@@ -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}
 

include/site/x86_64-openwrt-linux-gnu

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

include/site/x86_64-openwrt-linux-musl

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

include/site/x86_64-openwrt-linux-uclibc

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