diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-20 18:41:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-20 18:41:11 +0100 |
| commit | 272b9fb572a6b1f585cf6f4f4150b07f1c1537bf (patch) | |
| tree | 5ede8c935478f6db39bf8efc7ea14919e58d6aa1 /scripts | |
| parent | bde68f551d953927d476dc4f5ccd1c89ca001539 (diff) | |
| parent | ed95e17c2e88caff425eca534a794ea0c489fc5c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/config.sub | 5 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 27 |
2 files changed, 4 insertions, 28 deletions
diff --git a/scripts/config.sub b/scripts/config.sub index aa777f88c..c042dbadb 100755 --- a/scripts/config.sub +++ b/scripts/config.sub @@ -251,7 +251,7 @@ case $basic_machine in | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -712,6 +712,9 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 5d4a80abc..c94d01138 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -97,19 +97,6 @@ if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then NEED_XMLTO="$NEED_XMLTO libXfont" fi -if [[ -n $ADK_PACKAGE_PACEMAKER_MGMTD ]]; then - NEED_SWIG="$NEED_SWIG pacemaker-mgmtd" -fi - -if [[ -n $ADK_PACKAGE_EGLIBC ]]; then - NEED_GPERF="$NEED_GPERF eglibc" -fi - -if [[ -n $ADK_PACKAGE_XBMC ]]; then - NEED_SDLDEV="$NEED_SDLDEV xbmc" - NEED_SDLIMAGEDEV="$NEED_SDLIMAGEDEV xbmc" -fi - if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_100DPI ]]; then NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi" fi @@ -251,20 +238,6 @@ if [[ -n $NEED_WWW ]]; then fi fi -if [[ -n $NEED_SWIG ]]; then - if ! which swig >/dev/null 2>&1; then - echo >&2 You need swig to build $NEED_SWIG - out=1 - fi -fi - -if [[ -n $NEED_GPERF ]]; then - if ! which gperf >/dev/null 2>&1; then - echo >&2 You need gperf to build $NEED_GPERF - out=1 - fi -fi - if [[ -n $NEED_GXX ]]; then if ! which g++ >/dev/null 2>&1; then echo >&2 You need GNU c++ compiler to build $NEED_GXX |