Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

This commit is contained in:
Stephan Raue 2011-07-13 03:11:46 +02:00
commit 4a74f92868
30 changed files with 118 additions and 33 deletions

View File

@ -61,11 +61,44 @@ HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
HOST_CXXFLAGS="$HOST_CFLAGS" HOST_CXXFLAGS="$HOST_CFLAGS"
HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib" HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
# add distro specific library dirs
# ubuntu/debian specific "multiarch support"
FAMILY_TRIPLET=$(echo $HOST_NAME | sed -e "s,$(uname -m),$(uname -i),")
if [ -d /lib/$FAMILY_TRIPLET ]; then
HOST_LDFLAGS="$HOST_LDFLAGS -L/lib/$FAMILY_TRIPLET"
fi
if [ -d /usr/lib/$FAMILY_TRIPLET ]; then
HOST_LDFLAGS="$HOST_LDFLAGS -L/usr/lib/$FAMILY_TRIPLET"
fi
# default multiarch support
case "`uname -m`" in
i*86)
if [ -d /lib32 ]; then
HOST_LDFLAGS="$HOST_LDFLAGS -L/lib32"
fi
if [ -d /usr/lib32 ]; then
HOST_LDFLAGS="$HOST_LDFLAGS -L/usr/lib32"
fi
;;
x86_64)
if [ -d /lib64 ]; then
HOST_LDFLAGS="$HOST_LDFLAGS -L/lib64"
fi
if [ -d /usr/lib64 ]; then
HOST_LDFLAGS="$HOST_LDFLAGS -L/usr/lib64"
fi
;;
esac
# default dirs
HOST_LDFLAGS="$HOST_LDFLAGS -L/lib -L/usr/lib"
# use -fPIC when necessary # use -fPIC when necessary
case "`uname -m`" in case "`uname -m`" in
x86_64|ppc64|arm|armeb|armel) x86_64|ppc64|arm|armeb|armel)
HOST_CFLAGS="$HOST_CFLAGS -fPIC" HOST_CFLAGS="$HOST_CFLAGS -fPIC"
HOST_CXXFLAGS="$HOST_CXXFLAGS -fPIC" HOST_CXXFLAGS="$HOST_CXXFLAGS -fPIC"
HOST_LDFLAGS="$HOST_LDFLAGS -fPIC" HOST_LDFLAGS="$HOST_LDFLAGS -fPIC"
;; ;;
esac esac

View File

@ -12,7 +12,7 @@ set -e
# include ARCH specific options # include ARCH specific options
. config/arch.$TARGET_ARCH . config/arch.$TARGET_ARCH
HOST_NAME=`$SCRIPTS/configtools/config.guess` HOST_NAME=`$LOCAL_CC -dumpmachine`
TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI} TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION

View File

@ -29,7 +29,9 @@ setup_toolchain host
cd $BUILD/mysql* cd $BUILD/mysql*
do_autoreconf do_autoreconf
mkdir -p .objdir-host && cd .objdir-host mkdir -p .objdir-host && cd .objdir-host
../configure --prefix=/usr \ ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--libexecdir=/usr/sbin \ --libexecdir=/usr/sbin \
--localstatedir=/var/mysql \ --localstatedir=/var/mysql \

View File

@ -32,7 +32,9 @@ cd $DBUS_GLIB_DIR
do_autoreconf do_autoreconf
mkdir -p .build-host && cd .build-host mkdir -p .build-host && cd .build-host
../configure --prefix=$ROOT/$TOOLCHAIN \ ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--sysconfdir=$ROOT/$TOOLCHAIN/etc \ --sysconfdir=$ROOT/$TOOLCHAIN/etc \
--disable-tests \ --disable-tests \
--disable-bash-completion \ --disable-bash-completion \

View File

@ -32,7 +32,9 @@ cd $EGGDBUS_DIR
do_autoreconf do_autoreconf
mkdir -p .build-host && cd .build-host mkdir -p .build-host && cd .build-host
../configure --prefix=$ROOT/$TOOLCHAIN \ ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--sysconfdir=$ROOT/$TOOLCHAIN/etc \ --sysconfdir=$ROOT/$TOOLCHAIN/etc \
--disable-static \ --disable-static \
--enable-shared \ --enable-shared \

View File

@ -29,7 +29,9 @@ setup_toolchain host
cd $BUILD/file-* cd $BUILD/file-*
mkdir -p .build-host && cd .build-host mkdir -p .build-host && cd .build-host
../configure --prefix=$ROOT/$TOOLCHAIN \ ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--enable-shared \ --enable-shared \
--disable-static \ --disable-static \
--enable-fsect-man5 \ --enable-fsect-man5 \

View File

@ -32,7 +32,9 @@ cd $BUILD/glib*
do_autoreconf do_autoreconf
mkdir -p .build-host && cd .build-host mkdir -p .build-host && cd .build-host
../configure --prefix=$ROOT/$TOOLCHAIN \ ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--enable-shared \ --enable-shared \
--disable-static \ --disable-static \
--with-gnu-ld \ --with-gnu-ld \

View File

@ -43,7 +43,9 @@ cd ..
mkdir -p .build-host && cd .build-host mkdir -p .build-host && cd .build-host
../configure --prefix=$ROOT/$TOOLCHAIN \ ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--enable-polly \ --enable-polly \
--enable-optimized \ --enable-optimized \
--disable-profiling \ --disable-profiling \

View File

@ -27,7 +27,9 @@ CWD=`pwd`
setup_toolchain host setup_toolchain host
cd $PKG_BUILD/ncurses-host cd $PKG_BUILD/ncurses-host
./configure --prefix=$ROOT/$TOOLCHAIN \ ./configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--with-shared \ --with-shared \
make -C include make -C include

View File

@ -30,13 +30,20 @@ else
BUSYBOX_CFG_FILE=$ROOT/$PKG_DIR/config/$1.conf BUSYBOX_CFG_FILE=$ROOT/$PKG_DIR/config/$1.conf
fi fi
# fails to build with gcc-4.6.1
strip_lto
# fails to build with gcc-4.6.1 (ggc bug #49716
CFLAGS=`echo $CFLAGS | sed -e "s|-ftree-loop-distribution||"`
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-interchange||"`
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-strip-mine||"`
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-block||"`
CFLAGS=`echo $CFLAGS | sed -e "s|-fgraphite-identity||"`
# optimize for size # optimize for size
CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"` CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"`
CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"` CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"`
# fails to build with gcc-4.6.1
strip_lto
LDFLAGS="$LDFLAGS -fwhole-program" LDFLAGS="$LDFLAGS -fwhole-program"
cd $BUILD/busybox* cd $BUILD/busybox*

View File

@ -32,7 +32,9 @@ setup_toolchain host
OPT="$HOST_CFLAGS" \ OPT="$HOST_CFLAGS" \
LDFLAGS="$LDFLAGS -lexpat" \ LDFLAGS="$LDFLAGS -lexpat" \
../configure --prefix=$ROOT/$TOOLCHAIN \ ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--cache-file=config.cache \ --cache-file=config.cache \
--enable-shared \ --enable-shared \
--without-cxx-main \ --without-cxx-main \

View File

@ -30,7 +30,9 @@ cd $BUILD/libIDL*
mkdir -p .build-host && cd .build-host mkdir -p .build-host && cd .build-host
libIDL_cv_long_long_format=ll \ libIDL_cv_long_long_format=ll \
../configure --prefix=$ROOT/$TOOLCHAIN ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN
$SED "s:pkg-config :PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH $PKG_CONFIG :" libIDL-config-2 $SED "s:pkg-config :PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH $PKG_CONFIG :" libIDL-config-2

View File

@ -31,6 +31,13 @@ fi
# fails to build with gcc-4.6.1 # fails to build with gcc-4.6.1
strip_lto strip_lto
# fails to build with gcc-4.6.1 (ggc bug #49716
CFLAGS=`echo $CFLAGS | sed -e "s|-ftree-loop-distribution||"`
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-interchange||"`
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-strip-mine||"`
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-block||"`
CFLAGS=`echo $CFLAGS | sed -e "s|-fgraphite-identity||"`
# optimize for size # optimize for size
CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"` CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"`
CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"` CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"`

View File

@ -33,7 +33,9 @@ cd $DBUS_DIR
do_autoreconf do_autoreconf
mkdir -p .build-host && cd .build-host mkdir -p .build-host && cd .build-host
../configure --prefix=$ROOT/$TOOLCHAIN \ ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--sysconfdir=$ROOT/$TOOLCHAIN/etc \ --sysconfdir=$ROOT/$TOOLCHAIN/etc \
--disable-tests \ --disable-tests \
--disable-xml-docs \ --disable-xml-docs \

View File

@ -50,7 +50,6 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
--disable-keymap \ --disable-keymap \
--disable-floppy \ --disable-floppy \
--disable-edd \ --disable-edd \
--disable-action_modeswitch \
--without-selinux \ --without-selinux \
--without-systemdsystemunitdir \ --without-systemdsystemunitdir \
--with-firmware-path=/lib/firmware \ --with-firmware-path=/lib/firmware \

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="udev" PKG_NAME="udev"
PKG_VERSION="171" PKG_VERSION="172"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -30,7 +30,9 @@ cd $BUILD/expat-*
do_autoreconf -I conftools do_autoreconf -I conftools
mkdir -p .build-host && cd .build-host mkdir -p .build-host && cd .build-host
../configure --prefix=$ROOT/$TOOLCHAIN \ ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--enable-shared \ --enable-shared \
--disable-static \ --disable-static \

View File

@ -30,7 +30,9 @@ cd $BUILD/libxml2-*
do_autoreconf do_autoreconf
mkdir -p .build-host && cd .build-host mkdir -p .build-host && cd .build-host
../configure --prefix=$ROOT/$TOOLCHAIN \ ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--disable-ipv6 \ --disable-ipv6 \
--with-python \ --with-python \
--with-zlib --with-zlib

View File

@ -25,7 +25,9 @@
setup_toolchain host setup_toolchain host
cd $PKG_BUILD cd $PKG_BUILD
./configure --prefix=$ROOT/$TOOLCHAIN ./configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN
make make
make install make install

View File

@ -25,7 +25,9 @@
setup_toolchain host setup_toolchain host
cd $PKG_BUILD cd $PKG_BUILD
./configure --enable-shared \ ./configure --host=$HOST_NAME \
--build=$HOST_NAME \
--enable-shared \
--disable-static \ --disable-static \
--with-gnu-ld --with-gnu-ld

View File

@ -25,7 +25,9 @@
setup_toolchain host setup_toolchain host
cd $PKG_BUILD cd $PKG_BUILD
./configure --prefix=$ROOT/$TOOLCHAIN ./configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN
make make
make install make install

View File

@ -25,7 +25,9 @@
setup_toolchain host setup_toolchain host
cd $PKG_BUILD cd $PKG_BUILD
./configure --prefix=$ROOT/$TOOLCHAIN \ ./configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
--disable-debug \ --disable-debug \
--disable-warnerror \ --disable-warnerror \
--disable-profiling \ --disable-profiling \

View File

@ -24,7 +24,8 @@ PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://invisible-island.net/dialog/" PKG_SITE="http://invisible-island.net/dialog/"
PKG_URL="ftp://invisible-island.net/dialog/$PKG_NAME-$PKG_VERSION.tgz" #PKG_URL="ftp://invisible-island.net/dialog/$PKG_NAME-$PKG_VERSION.tgz"
PKG_URL="http://ftp.netbsd.org/pub/NetBSD/packages/distfiles/$PKG_NAME-$PKG_VERSION.tgz"
PKG_DEPENDS="ncurses" PKG_DEPENDS="ncurses"
PKG_BUILD_DEPENDS="toolchain ncurses" PKG_BUILD_DEPENDS="toolchain ncurses"
PKG_PRIORITY="optional" PKG_PRIORITY="optional"

View File

@ -30,7 +30,9 @@ setup_toolchain host
cd $FONT_UTIL_DIR cd $FONT_UTIL_DIR
mkdir -p .objdir-host && cd .objdir-host mkdir -p .objdir-host && cd .objdir-host
../configure --prefix=$ROOT/$TOOLCHAIN ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN
make make
make install make install

View File

@ -31,7 +31,9 @@ setup_toolchain host
cd $XPROTO_DIR cd $XPROTO_DIR
mkdir -p .objdir-host && cd .objdir-host mkdir -p .objdir-host && cd .objdir-host
../configure --prefix=$ROOT/$TOOLCHAIN ../configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN
make make
make install make install

View File

@ -26,7 +26,9 @@ setup_toolchain host
cd $PKG_BUILD cd $PKG_BUILD
./configure --prefix=$ROOT/$TOOLCHAIN \ ./configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN \
make make
make install make install

View File

@ -75,7 +75,7 @@
OPTIMIZATIONS="fast" OPTIMIZATIONS="fast"
# Project CFLAGS # Project CFLAGS
PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe" PROJECT_CFLAGS="-mfpmath=sse -msse2 -mssse3 -ftree-vectorize"
# LTO (Link Time Optimazion) support # LTO (Link Time Optimazion) support
LTO_SUPPORT="no" LTO_SUPPORT="no"

View File

@ -75,7 +75,7 @@
OPTIMIZATIONS="fast" OPTIMIZATIONS="fast"
# Project CFLAGS # Project CFLAGS
PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe" PROJECT_CFLAGS="-mfpmath=sse -msse2 -mssse3 -mmovbe -ftree-vectorize"
# LTO (Link Time Optimazion) support # LTO (Link Time Optimazion) support
LTO_SUPPORT="no" LTO_SUPPORT="no"

View File

@ -75,7 +75,7 @@
OPTIMIZATIONS="fast" OPTIMIZATIONS="fast"
# Project CFLAGS # Project CFLAGS
PROJECT_CFLAGS="" PROJECT_CFLAGS="-mfpmath=sse -msse2 -mssse3 -mmovbe -ftree-vectorize"
# LTO (Link Time Optimazion) support # LTO (Link Time Optimazion) support
LTO_SUPPORT="no" LTO_SUPPORT="no"

View File

@ -75,7 +75,7 @@
OPTIMIZATIONS="fast" OPTIMIZATIONS="fast"
# Project CFLAGS # Project CFLAGS
PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe" PROJECT_CFLAGS="-mfpmath=sse -msse2 -mssse3 -mmovbe -ftree-vectorize"
# LTO (Link Time Optimazion) support # LTO (Link Time Optimazion) support
LTO_SUPPORT="no" LTO_SUPPORT="no"