mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-09 16:01:54 -09:00
support: move package/gnuconfig to support/gnuconfig
The CONFIG_UPDATE macro is no longer defined in package/gnuconfig/gnuconfig.mk, but instead in package/Makefile.autotools.in. It it also changed a little bit to take the directory of the package sources as argument, and the AUTOTARGETS infrastructure is updated to use this macro. [Peter: drop echo in CONFIG_UPDATE] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni
committed by
Peter Korsgaard
Peter Korsgaard
parent
56da3859c7
commit
102a93bdca
5
support/gnuconfig/.cvsignore
Normal file
5
support/gnuconfig/.cvsignore
Normal file
@@ -0,0 +1,5 @@
|
||||
.cvsignore
|
||||
README.buildroot
|
||||
gnuconfig.mk
|
||||
patches
|
||||
.svn
|
||||
25
support/gnuconfig/README.buildroot
Normal file
25
support/gnuconfig/README.buildroot
Normal file
@@ -0,0 +1,25 @@
|
||||
--- HOWTO ---
|
||||
If your package uses config.guess and/or config.sub, then it probably
|
||||
relies on the autotools as its build system. In this case, you should
|
||||
use the AUTOTARGETS infrastructure, which will take care of updating
|
||||
the config.guess and/or config.sub files appropriately. See the
|
||||
Buildroot documentation for details about the AUTOTARGETS
|
||||
infrastructure.
|
||||
|
||||
If for some reason your package does not use the AUTOTARGETS
|
||||
infrastructure, you can request the config.guess and/or config.sub
|
||||
files of your package to be updated by using:
|
||||
|
||||
$(call CONFIG_UPDATE,directory-of-your-package-sources)
|
||||
|
||||
--- UPDATE ---
|
||||
GNU config is now managed in git, so to update:
|
||||
|
||||
# git clone git://git.savannah.gnu.org/config.git
|
||||
# cp config/config.* .
|
||||
# for p in $(ls patches/*.patch); do patch -p0 < $p; done
|
||||
# rm -rf config
|
||||
|
||||
A few local customizations are used to support uClibc so you may
|
||||
have to make sure they're still needed. The patches are broken
|
||||
out in the patches/ dir to keep things simple.
|
||||
1527
support/gnuconfig/config.guess
vendored
Executable file
1527
support/gnuconfig/config.guess
vendored
Executable file
File diff suppressed because it is too large
Load Diff
1757
support/gnuconfig/config.sub
vendored
Executable file
1757
support/gnuconfig/config.sub
vendored
Executable file
File diff suppressed because it is too large
Load Diff
149
support/gnuconfig/patches/config.guess.uclibc.patch
Normal file
149
support/gnuconfig/patches/config.guess.uclibc.patch
Normal file
@@ -0,0 +1,149 @@
|
||||
--- config.guess
|
||||
+++ config.guess
|
||||
@@ -140,6 +141,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
|
||||
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
||||
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
||||
|
||||
+if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
|
||||
+ eval $set_cc_for_build
|
||||
+ cat << EOF > $dummy.c
|
||||
+ #include <features.h>
|
||||
+ #ifdef __UCLIBC__
|
||||
+ # ifdef __UCLIBC_CONFIG_VERSION__
|
||||
+ LIBC=uclibc __UCLIBC_CONFIG_VERSION__
|
||||
+ # else
|
||||
+ LIBC=uclibc
|
||||
+ # endif
|
||||
+ #else
|
||||
+ LIBC=gnu
|
||||
+ #endif
|
||||
+EOF
|
||||
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
|
||||
+fi
|
||||
+
|
||||
# Note: order is significant - the case branches are not exclusive.
|
||||
|
||||
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
@@ -872,33 +890,32 @@ EOF
|
||||
EV68*) UNAME_MACHINE=alphaev68 ;;
|
||||
esac
|
||||
objdump --private-headers /bin/sh | grep -q ld.so.1
|
||||
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
||||
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
arm*:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
| grep -q __ARM_EABI__
|
||||
then
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
else
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
||||
fi
|
||||
exit ;;
|
||||
avr32*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
cris:Linux:*:*)
|
||||
- echo cris-axis-linux-gnu
|
||||
+ echo cris-axis-linux-${LIBC}
|
||||
exit ;;
|
||||
crisv32:Linux:*:*)
|
||||
- echo crisv32-axis-linux-gnu
|
||||
+ echo crisv32-axis-linux-${LIBC}
|
||||
exit ;;
|
||||
frv:Linux:*:*)
|
||||
- echo frv-unknown-linux-gnu
|
||||
+ echo frv-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
i*86:Linux:*:*)
|
||||
- LIBC=gnu
|
||||
eval $set_cc_for_build
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
#ifdef __dietlibc__
|
||||
@@ -909,13 +926,13 @@ EOF
|
||||
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||
exit ;;
|
||||
ia64:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
m32r*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
m68*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
mips:Linux:*:* | mips64:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
@@ -934,10 +951,10 @@ EOF
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
|
||||
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
||||
;;
|
||||
or32:Linux:*:*)
|
||||
- echo or32-unknown-linux-gnu
|
||||
+ echo or32-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
padre:Linux:*:*)
|
||||
echo sparc-unknown-linux-gnu
|
||||
@@ -948,40 +965,40 @@ EOF
|
||||
parisc:Linux:*:* | hppa:Linux:*:*)
|
||||
# Look for CPU level
|
||||
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
||||
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
|
||||
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
|
||||
- *) echo hppa-unknown-linux-gnu ;;
|
||||
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
|
||||
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
|
||||
+ *) echo hppa-unknown-linux-${LIBC} ;;
|
||||
esac
|
||||
exit ;;
|
||||
ppc64:Linux:*:*)
|
||||
- echo powerpc64-unknown-linux-gnu
|
||||
+ echo powerpc64-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
ppc:Linux:*:*)
|
||||
- echo powerpc-unknown-linux-gnu
|
||||
+ echo powerpc-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
s390:Linux:*:* | s390x:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-ibm-linux
|
||||
exit ;;
|
||||
sh64*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
sh*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
tile*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-tilera-linux-gnu
|
||||
exit ;;
|
||||
vax:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-dec-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
|
||||
exit ;;
|
||||
x86_64:Linux:*:*)
|
||||
- echo x86_64-unknown-linux-gnu
|
||||
+ echo x86_64-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
xtensa*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
i*86:DYNIX/ptx:4*:*)
|
||||
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
|
||||
45
support/gnuconfig/patches/config.sub.ps2.patch
Normal file
45
support/gnuconfig/patches/config.sub.ps2.patch
Normal file
@@ -0,0 +1,45 @@
|
||||
--- config.sub
|
||||
+++ config.sub
|
||||
@@ -253,7 +253,7 @@ case $basic_machine in
|
||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
||||
| bfin \
|
||||
| c4x | clipper \
|
||||
- | d10v | d30v | dlx | dsp16xx \
|
||||
+ | d10v | d30v | dlx | dsp16xx | dvp \
|
||||
| fido | fr30 | frv \
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
@@ -773,6 +773,24 @@ case $basic_machine in
|
||||
basic_machine=m68k-atari
|
||||
os=-mint
|
||||
;;
|
||||
+ mipsEE* | ee | ps2)
|
||||
+ basic_machine=mips64r5900el-scei
|
||||
+ case $os in
|
||||
+ -linux*)
|
||||
+ ;;
|
||||
+ *)
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+ iop)
|
||||
+ basic_machine=mipsel-scei
|
||||
+ os=-irx
|
||||
+ ;;
|
||||
+ dvp)
|
||||
+ basic_machine=dvp-scei
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
mips3*-*)
|
||||
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
|
||||
;;
|
||||
@@ -1325,7 +1343,7 @@ case $os in
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
|
||||
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -irx*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
Reference in New Issue
Block a user