Skip to content

Commit 1b62092

Browse files
dangowrtdangowrt
committed
Revert "build: use config.site generated by autoconf-lean, drop hardcoded sitefiles"
This reverts commit f439e29. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
1 parent 81d8f87 commit 1b62092

File tree

20 files changed

+535
-1
lines changed

20 files changed

+535
-1
lines changed

‎Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ endif
8282

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

8692
$(BIN_DIR)/profiles.json: FORCE
8793
$(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \

‎include/package.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ include $(INCLUDE_DIR)/autotools.mk
116116
_pkg_target:=$(if $(QUILT),,.)
117117

118118
override MAKEFLAGS=
119-
CONFIG_SITE:=$(TOOLCHAIN_DIR)/config.site
119+
CONFIG_SITE:=$(INCLUDE_DIR)/site/$(ARCH)
120120
CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
121121
SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
122122
PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig

‎include/site/aarch64‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/sh
2+
. $TOPDIR/include/site/linux
3+
ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
4+
ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
5+
6+
ac_cv_sizeof___int64=8
7+
ac_cv_sizeof_char=1
8+
ac_cv_sizeof_int=4
9+
ac_cv_sizeof_int16_t=2
10+
ac_cv_sizeof_int32_t=4
11+
ac_cv_sizeof_int64_t=8
12+
ac_cv_sizeof_long_int=8
13+
ac_cv_sizeof_long_long=8
14+
ac_cv_sizeof_long=8
15+
ac_cv_sizeof_off_t=8
16+
ac_cv_sizeof_short_int=2
17+
ac_cv_sizeof_short=2
18+
ac_cv_sizeof_size_t=8
19+
ac_cv_sizeof_ssize_t=8
20+
ac_cv_sizeof_u_int16_t=2
21+
ac_cv_sizeof_u_int32_t=4
22+
ac_cv_sizeof_u_int64_t=8
23+
ac_cv_sizeof_uint16_t=2
24+
ac_cv_sizeof_uint32_t=4
25+
ac_cv_sizeof_uint64_t=8
26+
ac_cv_sizeof_unsigned_int=4
27+
ac_cv_sizeof_unsigned_long=8
28+
ac_cv_sizeof_unsigned_long_long=8
29+
ac_cv_sizeof_unsigned_short=2
30+
ac_cv_sizeof_void_p=8

‎include/site/aarch64_be‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/sh
2+
. $TOPDIR/include/site/linux
3+
ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
4+
ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
5+
6+
ac_cv_sizeof___int64=8
7+
ac_cv_sizeof_char=1
8+
ac_cv_sizeof_int=4
9+
ac_cv_sizeof_int16_t=2
10+
ac_cv_sizeof_int32_t=4
11+
ac_cv_sizeof_int64_t=8
12+
ac_cv_sizeof_long_int=8
13+
ac_cv_sizeof_long_long=8
14+
ac_cv_sizeof_long=8
15+
ac_cv_sizeof_off_t=8
16+
ac_cv_sizeof_short_int=2
17+
ac_cv_sizeof_short=2
18+
ac_cv_sizeof_size_t=8
19+
ac_cv_sizeof_ssize_t=8
20+
ac_cv_sizeof_u_int16_t=2
21+
ac_cv_sizeof_u_int32_t=4
22+
ac_cv_sizeof_u_int64_t=8
23+
ac_cv_sizeof_uint16_t=2
24+
ac_cv_sizeof_uint32_t=4
25+
ac_cv_sizeof_uint64_t=8
26+
ac_cv_sizeof_unsigned_int=4
27+
ac_cv_sizeof_unsigned_long=8
28+
ac_cv_sizeof_unsigned_long_long=8
29+
ac_cv_sizeof_unsigned_short=2
30+
ac_cv_sizeof_void_p=8

‎include/site/arc‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/sh
2+
. $TOPDIR/include/site/linux
3+
ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
4+
ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
5+
6+
ac_cv_sizeof___int64=0
7+
ac_cv_sizeof_char=1
8+
ac_cv_sizeof_int=4
9+
ac_cv_sizeof_int16_t=2
10+
ac_cv_sizeof_int32_t=4
11+
ac_cv_sizeof_int64_t=8
12+
ac_cv_sizeof_long_int=4
13+
ac_cv_sizeof_long_long=8
14+
ac_cv_sizeof_long=4
15+
ac_cv_sizeof_off_t=8
16+
ac_cv_sizeof_short_int=2
17+
ac_cv_sizeof_short=2
18+
ac_cv_sizeof_size_t=4
19+
ac_cv_sizeof_ssize_t=4
20+
ac_cv_sizeof_u_int16_t=2
21+
ac_cv_sizeof_u_int32_t=4
22+
ac_cv_sizeof_u_int64_t=8
23+
ac_cv_sizeof_uint16_t=2
24+
ac_cv_sizeof_uint32_t=4
25+
ac_cv_sizeof_uint64_t=8
26+
ac_cv_sizeof_unsigned_int=4
27+
ac_cv_sizeof_unsigned_long=4
28+
ac_cv_sizeof_unsigned_long_long=8
29+
ac_cv_sizeof_unsigned_short=2
30+
ac_cv_sizeof_void_p=4

‎include/site/arm‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/sh
2+
. $TOPDIR/include/site/linux
3+
ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
4+
ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
5+
6+
ac_cv_sizeof___int64=0
7+
ac_cv_sizeof_char=1
8+
ac_cv_sizeof_int=4
9+
ac_cv_sizeof_int16_t=2
10+
ac_cv_sizeof_int32_t=4
11+
ac_cv_sizeof_int64_t=8
12+
ac_cv_sizeof_long_int=4
13+
ac_cv_sizeof_long_long=8
14+
ac_cv_sizeof_long=4
15+
ac_cv_sizeof_off_t=8
16+
ac_cv_sizeof_short_int=2
17+
ac_cv_sizeof_short=2
18+
ac_cv_sizeof_size_t=4
19+
ac_cv_sizeof_ssize_t=4
20+
ac_cv_sizeof_u_int16_t=2
21+
ac_cv_sizeof_u_int32_t=4
22+
ac_cv_sizeof_u_int64_t=8
23+
ac_cv_sizeof_uint16_t=2
24+
ac_cv_sizeof_uint32_t=4
25+
ac_cv_sizeof_uint64_t=8
26+
ac_cv_sizeof_unsigned_int=4
27+
ac_cv_sizeof_unsigned_long=4
28+
ac_cv_sizeof_unsigned_long_long=8
29+
ac_cv_sizeof_unsigned_short=2
30+
ac_cv_sizeof_void_p=4

‎include/site/armeb‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/sh
2+
. $TOPDIR/include/site/linux
3+
ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
4+
ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
5+
6+
ac_cv_sizeof___int64=0
7+
ac_cv_sizeof_char=1
8+
ac_cv_sizeof_int=4
9+
ac_cv_sizeof_int16_t=2
10+
ac_cv_sizeof_int32_t=4
11+
ac_cv_sizeof_int64_t=8
12+
ac_cv_sizeof_long_int=4
13+
ac_cv_sizeof_long_long=8
14+
ac_cv_sizeof_long=4
15+
ac_cv_sizeof_off_t=8
16+
ac_cv_sizeof_short_int=2
17+
ac_cv_sizeof_short=2
18+
ac_cv_sizeof_size_t=4
19+
ac_cv_sizeof_ssize_t=4
20+
ac_cv_sizeof_u_int16_t=2
21+
ac_cv_sizeof_u_int32_t=4
22+
ac_cv_sizeof_u_int64_t=8
23+
ac_cv_sizeof_uint16_t=2
24+
ac_cv_sizeof_uint32_t=4
25+
ac_cv_sizeof_uint64_t=8
26+
ac_cv_sizeof_unsigned_int=4
27+
ac_cv_sizeof_unsigned_long=4
28+
ac_cv_sizeof_unsigned_long_long=8
29+
ac_cv_sizeof_unsigned_short=2
30+
ac_cv_sizeof_void_p=4

‎include/site/i386‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
. $TOPDIR/include/site/i486
3+

‎include/site/i486‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/sh
2+
. $TOPDIR/include/site/linux
3+
ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
4+
ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
5+
6+
ac_cv_sizeof___int64=0
7+
ac_cv_sizeof_char=1
8+
ac_cv_sizeof_int=4
9+
ac_cv_sizeof_int16_t=2
10+
ac_cv_sizeof_int32_t=4
11+
ac_cv_sizeof_int64_t=8
12+
ac_cv_sizeof_long_int=4
13+
ac_cv_sizeof_long_long=8
14+
ac_cv_sizeof_long=4
15+
ac_cv_sizeof_off_t=8
16+
ac_cv_sizeof_short_int=2
17+
ac_cv_sizeof_short=2
18+
ac_cv_sizeof_size_t=4
19+
ac_cv_sizeof_ssize_t=4
20+
ac_cv_sizeof_u_int16_t=2
21+
ac_cv_sizeof_u_int32_t=4
22+
ac_cv_sizeof_u_int64_t=8
23+
ac_cv_sizeof_uint16_t=2
24+
ac_cv_sizeof_uint32_t=4
25+
ac_cv_sizeof_uint64_t=8
26+
ac_cv_sizeof_unsigned_int=4
27+
ac_cv_sizeof_unsigned_long=4
28+
ac_cv_sizeof_unsigned_long_long=8
29+
ac_cv_sizeof_unsigned_short=2
30+
ac_cv_sizeof_void_p=4

‎include/site/i686‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
. $TOPDIR/include/site/i486
3+

0 commit comments

Comments
 (0)