toolchain:

- remove all references to uClibc (Step 1 to remove uClibc)
This commit is contained in:
Stephan Raue 2009-12-19 17:47:50 +01:00
parent dc41626110
commit e56089b2f0
5 changed files with 9 additions and 23 deletions

View File

@ -13,16 +13,6 @@ case $TARGET_ARCH in
;;
esac
case $TARGET_LIBC in
uClibc)
TARGET_NAME=$TARGET_FAMILY-openelec-linux-uclibc
;;
eglibc)
TARGET_NAME=$TARGET_FAMILY-openelec-linux-gnu
;;
esac
# determines TARGET_CPU, if not forced by user
if [ -z "$TARGET_CPU" ]; then
case $TARGET_ARCH in
@ -36,13 +26,15 @@ if [ -z "$TARGET_CPU" ]; then
esac
fi
TARGET_NAME=$TARGET_FAMILY-openelec-linux-gnu
OPENELEC_VERSION=`cat VERSION`
CONFIG=config
SCRIPTS=scripts
PACKAGES=packages
SOURCES=sources
BUILD_BASE=build
BUILD=$BUILD_BASE.OpenELEC-$PROJECT.$TARGET_ARCH-$TARGET_LIBC.$OPENELEC_VERSION
BUILD=$BUILD_BASE.OpenELEC-$PROJECT.$TARGET_ARCH.$OPENELEC_VERSION
[ -n "$TARGET_PLATFORM" ] && BUILD=$BUILD.$TARGET_PLATFORM
PKG_BUILD=$BUILD/$1\[-_][0-9]*
#PKG_DIR=`find $PACKAGES -type d -name $1 -not -regex ".*cinit.*"`

View File

@ -10,7 +10,7 @@ BZR_BUILD=`bzr version-info --custom --template={revno}`
[ "$OPENELEC_VERSION" = devel -o "$OPENELEC_VERSION" = debug ] && \
OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$BZR_BUILD
TARGET_VERSION="$PROJECT-$TARGET_LIBC-$OPENELEC_VERSION"
TARGET_VERSION="$PROJECT-$OPENELEC_VERSION"
case "$2" in
system)
@ -45,7 +45,7 @@ case "$2" in
ln -sf /var/media $INSTALL/media
# Basissystem...
$SCRIPTS/install $TARGET_LIBC
$SCRIPTS/install eglibc
$SCRIPTS/install gcc-final
$SCRIPTS/install linux $2
$SCRIPTS/install busybox

View File

@ -61,9 +61,6 @@ $SCRIPTS/install samba
PKG_DIR=`find $PACKAGES -type d -name $1`
XBMC_TARGET_SYSTEM="linux"
[ $TARGET_LIBC = "uClibc" ] && XBMC_TARGET_SYSTEM="uclibc"
mkdir -p $INSTALL/usr/bin
ln -s /usr/share/xbmc/xbmc.bin $INSTALL/usr/bin/xbmc
@ -96,7 +93,7 @@ mkdir -p $INSTALL/usr/share/xbmc/sounds
mkdir -p $INSTALL/usr/share/xbmc/system
cp -PR $PKG_BUILD/system/*$XBMC_TARGET_SYSTEM.so $INSTALL/usr/share/xbmc/system
cp -PR $PKG_BUILD/system/*linux.so $INSTALL/usr/share/xbmc/system
cp -PR $PKG_BUILD/system/*.xml $INSTALL/usr/share/xbmc/system
cp -PR $PKG_BUILD/system/*.conf $INSTALL/usr/share/xbmc/system

View File

@ -11,7 +11,7 @@ $SCRIPTS/build intltool
$SCRIPTS/install binutils
$SCRIPTS/install gcc-core
$SCRIPTS/install $TARGET_LIBC toolchain
$SCRIPTS/install eglibc toolchain
if [ "c" != "$TOOLCHAIN_LANGUAGES" ]; then
$SCRIPTS/install gcc-final toolchain

View File

@ -4,14 +4,11 @@
$SCRIPTS/install ccache toolchain
$SCRIPTS/install binutils
$SCRIPTS/install $TARGET_LIBC toolchain
$SCRIPTS/install eglibc toolchain
$SCRIPTS/unpack gcc
setup_toolchain host
TLS_CONFIG="--enable-tls"
[ $TARGET_LIBC = "uClibc" ] && TLS_CONFIG="--disable-tls"
cd $BUILD/gcc*
mkdir -p objdir-$1
cd objdir-$1
@ -28,7 +25,7 @@ cd objdir-$1
--disable-libmudflap \
--disable-libssp \
--disable-multilib \
$TLS_CONFIG \
--enable-tls \
--enable-shared \
--enable-c99 \
--enable-long-long \