Merge branch 'openelec-eden' of github.com:OpenELEC/OpenELEC.tv into openelec-pvr

2025-07-24 11:16:51 +00:00 · 2011-07-13 03:13:54 +02:00 · 2011-07-13 03:13:54 +02:00 · 77aa7cfef9
commit 77aa7cfef9
parent ba1c9844f4 6933fb1466
30 changed files with 118 additions and 33 deletions
--- a/config/optimize
+++ b/config/optimize
@ -61,11 +61,44 @@ HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
 HOST_CXXFLAGS="$HOST_CFLAGS"
 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
  case "`uname -m`" in
    x86_64|ppc64|arm|armeb|armel)
-    HOST_CFLAGS="$HOST_CFLAGS -fPIC"
-    HOST_CXXFLAGS="$HOST_CXXFLAGS -fPIC"
-    HOST_LDFLAGS="$HOST_LDFLAGS -fPIC"
+      HOST_CFLAGS="$HOST_CFLAGS -fPIC"
+      HOST_CXXFLAGS="$HOST_CXXFLAGS -fPIC"
+      HOST_LDFLAGS="$HOST_LDFLAGS -fPIC"
    ;;
  esac
--- a/config/path
+++ b/config/path
@ -12,7 +12,7 @@ set -e
 # include ARCH specific options
  . 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}

 BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
--- a/packages/databases/mysql-hosttools/build
+++ b/packages/databases/mysql-hosttools/build
@ -29,7 +29,9 @@ setup_toolchain host
 cd $BUILD/mysql*
 do_autoreconf
 mkdir -p .objdir-host && cd .objdir-host
-../configure --prefix=/usr \
+../configure --host=$HOST_NAME \
+             --build=$HOST_NAME \
+             --prefix=/usr \
             --sysconfdir=/etc \
             --libexecdir=/usr/sbin \
             --localstatedir=/var/mysql \
--- a/packages/devel/dbus-glib-host/build
+++ b/packages/devel/dbus-glib-host/build
@ -32,7 +32,9 @@ cd $DBUS_GLIB_DIR

 do_autoreconf
 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 \
             --disable-tests \
             --disable-bash-completion \
--- a/packages/devel/eggdbus-host/build
+++ b/packages/devel/eggdbus-host/build
@ -32,7 +32,9 @@ cd $EGGDBUS_DIR
 do_autoreconf

 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 \
             --disable-static \
             --enable-shared \
--- a/packages/devel/file-host/build
+++ b/packages/devel/file-host/build
@ -29,7 +29,9 @@ setup_toolchain host
 cd $BUILD/file-*

 mkdir -p .build-host && cd .build-host
-../configure --prefix=$ROOT/$TOOLCHAIN \
+../configure --host=$HOST_NAME \
+             --build=$HOST_NAME \
+             --prefix=$ROOT/$TOOLCHAIN \
             --enable-shared \
             --disable-static \
             --enable-fsect-man5 \
--- a/packages/devel/glib-host/build
+++ b/packages/devel/glib-host/build
@ -32,7 +32,9 @@ cd $BUILD/glib*

 do_autoreconf
 mkdir -p .build-host && cd .build-host
-../configure --prefix=$ROOT/$TOOLCHAIN \
+../configure --host=$HOST_NAME \
+             --build=$HOST_NAME \
+             --prefix=$ROOT/$TOOLCHAIN \
             --enable-shared \
             --disable-static \
             --with-gnu-ld \
--- a/packages/devel/llvm-host/build
+++ b/packages/devel/llvm-host/build
@ -43,7 +43,9 @@ cd ..

 mkdir -p .build-host && cd .build-host

-../configure --prefix=$ROOT/$TOOLCHAIN \
+../configure --host=$HOST_NAME \
+             --build=$HOST_NAME \
+             --prefix=$ROOT/$TOOLCHAIN \
             --enable-polly \
             --enable-optimized \
             --disable-profiling \
--- a/packages/devel/ncurses/build
+++ b/packages/devel/ncurses/build
@ -27,7 +27,9 @@ CWD=`pwd`
 setup_toolchain host

 cd $PKG_BUILD/ncurses-host
-./configure --prefix=$ROOT/$TOOLCHAIN \
+./configure --host=$HOST_NAME \
+            --build=$HOST_NAME \
+            --prefix=$ROOT/$TOOLCHAIN \
            --with-shared \

 make -C include
--- a/packages/initramfs/sysutils/busybox-initramfs/build
+++ b/packages/initramfs/sysutils/busybox-initramfs/build
@ -30,13 +30,20 @@ else
  BUSYBOX_CFG_FILE=$ROOT/$PKG_DIR/config/$1.conf
 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
  CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"`
  CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"`

-# fails to build with gcc-4.6.1
-  strip_lto
-
 LDFLAGS="$LDFLAGS -fwhole-program"

 cd $BUILD/busybox*
--- a/packages/lang/Python/build
+++ b/packages/lang/Python/build
@ -32,7 +32,9 @@ setup_toolchain host

 OPT="$HOST_CFLAGS" \
 LDFLAGS="$LDFLAGS -lexpat" \
-../configure --prefix=$ROOT/$TOOLCHAIN \
+../configure --host=$HOST_NAME \
+             --build=$HOST_NAME \
+             --prefix=$ROOT/$TOOLCHAIN \
             --cache-file=config.cache \
             --enable-shared \
             --without-cxx-main \
--- a/packages/other/libIDL-host/build
+++ b/packages/other/libIDL-host/build
@ -30,7 +30,9 @@ cd $BUILD/libIDL*
 mkdir -p .build-host && cd .build-host

 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

--- a/packages/sysutils/busybox/build
+++ b/packages/sysutils/busybox/build
@ -31,6 +31,13 @@ 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
  CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"`
  CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"`
--- a/packages/sysutils/dbus-host/build
+++ b/packages/sysutils/dbus-host/build
@ -33,7 +33,9 @@ cd $DBUS_DIR
 do_autoreconf

 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 \
             --disable-tests \
             --disable-xml-docs \
--- a/packages/sysutils/udev/build
+++ b/packages/sysutils/udev/build
@ -50,7 +50,6 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
            --disable-keymap \
            --disable-floppy \
            --disable-edd \
-            --disable-action_modeswitch \
            --without-selinux \
            --without-systemdsystemunitdir \
            --with-firmware-path=/lib/firmware \
--- a/packages/sysutils/udev/meta
+++ b/packages/sysutils/udev/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="udev"
-PKG_VERSION="171"
+PKG_VERSION="172"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/textproc/expat-host/build
+++ b/packages/textproc/expat-host/build
@ -30,7 +30,9 @@ cd $BUILD/expat-*
 do_autoreconf -I conftools

 mkdir -p .build-host && cd .build-host
-../configure --prefix=$ROOT/$TOOLCHAIN \
+../configure --host=$HOST_NAME \
+             --build=$HOST_NAME \
+             --prefix=$ROOT/$TOOLCHAIN \
             --enable-shared \
             --disable-static \

--- a/packages/textproc/libxml2-host/build
+++ b/packages/textproc/libxml2-host/build
@ -30,7 +30,9 @@ cd $BUILD/libxml2-*

 do_autoreconf
 mkdir -p .build-host && cd .build-host
-../configure --prefix=$ROOT/$TOOLCHAIN \
+../configure --host=$HOST_NAME \
+             --build=$HOST_NAME \
+             --prefix=$ROOT/$TOOLCHAIN \
             --disable-ipv6 \
             --with-python \
             --with-zlib
--- a/packages/toolchain/archivers/cpio/build
+++ b/packages/toolchain/archivers/cpio/build
@ -25,7 +25,9 @@
 setup_toolchain host

 cd $PKG_BUILD
-./configure --prefix=$ROOT/$TOOLCHAIN
+./configure --host=$HOST_NAME \
+            --build=$HOST_NAME \
+            --prefix=$ROOT/$TOOLCHAIN

 make
 make install
--- a/packages/toolchain/devel/pkg-config/build
+++ b/packages/toolchain/devel/pkg-config/build
@ -25,7 +25,9 @@
 setup_toolchain host

 cd $PKG_BUILD
-./configure --enable-shared \
+./configure --host=$HOST_NAME \
+            --build=$HOST_NAME \
+            --enable-shared \
            --disable-static \
            --with-gnu-ld

--- a/packages/toolchain/lang/nasm/build
+++ b/packages/toolchain/lang/nasm/build
@ -25,7 +25,9 @@
 setup_toolchain host

 cd $PKG_BUILD
-./configure --prefix=$ROOT/$TOOLCHAIN
+./configure --host=$HOST_NAME \
+            --build=$HOST_NAME \
+            --prefix=$ROOT/$TOOLCHAIN

 make
 make install
--- a/packages/toolchain/lang/yasm/build
+++ b/packages/toolchain/lang/yasm/build
@ -25,7 +25,9 @@
 setup_toolchain host

 cd $PKG_BUILD
-./configure --prefix=$ROOT/$TOOLCHAIN \
+./configure --host=$HOST_NAME \
+            --build=$HOST_NAME \
+            --prefix=$ROOT/$TOOLCHAIN \
            --disable-debug \
            --disable-warnerror \
            --disable-profiling \
--- a/packages/tools/dialog/meta
+++ b/packages/tools/dialog/meta
@ -24,7 +24,8 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 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_BUILD_DEPENDS="toolchain ncurses"
 PKG_PRIORITY="optional"
--- a/packages/x11/font/font-util-host/build
+++ b/packages/x11/font/font-util-host/build
@ -30,7 +30,9 @@ setup_toolchain host

 cd $FONT_UTIL_DIR
 mkdir -p .objdir-host && cd .objdir-host
-../configure --prefix=$ROOT/$TOOLCHAIN
+../configure --host=$HOST_NAME \
+             --build=$HOST_NAME \
+             --prefix=$ROOT/$TOOLCHAIN

 make
 make install
--- a/packages/x11/proto/xproto-host/build
+++ b/packages/x11/proto/xproto-host/build
@ -31,7 +31,9 @@ setup_toolchain host
 cd $XPROTO_DIR
 mkdir -p .objdir-host && cd .objdir-host

-../configure --prefix=$ROOT/$TOOLCHAIN
+../configure --host=$HOST_NAME \
+             --build=$HOST_NAME \
+             --prefix=$ROOT/$TOOLCHAIN

 make
 make install
--- a/packages/x11/util/makedepend/build
+++ b/packages/x11/util/makedepend/build
@ -26,7 +26,9 @@ setup_toolchain host

 cd $PKG_BUILD

-./configure --prefix=$ROOT/$TOOLCHAIN \
+./configure --host=$HOST_NAME \
+            --build=$HOST_NAME \
+            --prefix=$ROOT/$TOOLCHAIN \

 make
 make install
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@ -75,7 +75,7 @@
  OPTIMIZATIONS="fast"

 # Project CFLAGS
-  PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe"
+  PROJECT_CFLAGS="-mfpmath=sse -msse2 -mssse3 -ftree-vectorize"

 # LTO (Link Time Optimazion) support
  LTO_SUPPORT="no"
--- a/projects/ION/options
+++ b/projects/ION/options
@ -75,7 +75,7 @@
  OPTIMIZATIONS="fast"

 # Project CFLAGS
-  PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe"
+  PROJECT_CFLAGS="-mfpmath=sse -msse2 -mssse3 -mmovbe -ftree-vectorize"

 # LTO (Link Time Optimazion) support
  LTO_SUPPORT="no"
--- a/projects/Intel/options
+++ b/projects/Intel/options
@ -75,7 +75,7 @@
  OPTIMIZATIONS="fast"

 # Project CFLAGS
-  PROJECT_CFLAGS=""
+  PROJECT_CFLAGS="-mfpmath=sse -msse2 -mssse3 -mmovbe -ftree-vectorize"

 # LTO (Link Time Optimazion) support
  LTO_SUPPORT="no"
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@ -75,7 +75,7 @@
  OPTIMIZATIONS="fast"

 # Project CFLAGS
-  PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe"
+  PROJECT_CFLAGS="-mfpmath=sse -msse2 -mssse3 -mmovbe -ftree-vectorize"

 # LTO (Link Time Optimazion) support
  LTO_SUPPORT="no"