From 8df3c76ab55002e215c3931a6c56299d4090a062 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Jul 2011 14:42:21 +0200 Subject: [PATCH 01/26] busybox: fails to build with LOOP optimization Signed-off-by: Stephan Raue --- packages/sysutils/busybox/build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/sysutils/busybox/build b/packages/sysutils/busybox/build index ce0d4879e3..83484b0ab0 100755 --- 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|"` From c59de34f6229208f4e2db711acac37a7cfe4de3c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Jul 2011 14:42:39 +0200 Subject: [PATCH 02/26] busybox-initramfs: fails to build with LOOP optimization Signed-off-by: Stephan Raue --- packages/initramfs/sysutils/busybox-initramfs/build | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/build b/packages/initramfs/sysutils/busybox-initramfs/build index 9314eee63c..27f3fa4312 100755 --- 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* From c8201d3e3ca218071913f3f2525662c3ae1c923a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Jul 2011 15:08:59 +0200 Subject: [PATCH 03/26] projects/*/options: rework optimizations Signed-off-by: Stephan Raue --- projects/Fusion/options | 2 +- projects/ION/options | 2 +- projects/Intel/options | 2 +- projects/Ultra/options | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/Fusion/options b/projects/Fusion/options index 528f9cd643..d31690135c 100644 --- 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" diff --git a/projects/ION/options b/projects/ION/options index 89dd7f680c..fa18fbe8d8 100644 --- 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" diff --git a/projects/Intel/options b/projects/Intel/options index 4fc40aff01..f8d7c544cd 100644 --- 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" diff --git a/projects/Ultra/options b/projects/Ultra/options index 9f49fb05c4..63ae2c5feb 100644 --- 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" From bc74d809cbbb401b64f1f7bb855effb96dc79512 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Jul 2011 16:53:58 +0200 Subject: [PATCH 04/26] dialog: fix download url, site down Signed-off-by: Stephan Raue --- packages/tools/dialog/meta | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tools/dialog/meta b/packages/tools/dialog/meta index 53ee2998e2..daa09a3829 100644 --- 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" From adb95459e52842286436a37a2f4f3e7889aadd7e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Jul 2011 23:34:00 +0200 Subject: [PATCH 05/26] udev: update to udev-172 Signed-off-by: Stephan Raue --- packages/sysutils/udev/build | 1 - packages/sysutils/udev/meta | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build index b592e7927e..f3b1da0e71 100755 --- 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 \ diff --git a/packages/sysutils/udev/meta b/packages/sysutils/udev/meta index a999e31272..7a249ef13d 100644 --- 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" From e145754b544c88a2748865151286ba3e567454fd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:39:12 +0200 Subject: [PATCH 06/26] mysql-hosttools: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/databases/mysql-hosttools/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/databases/mysql-hosttools/build b/packages/databases/mysql-hosttools/build index 9c07c08caf..916ba780af 100755 --- 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 \ From ad44d62ee589267d3a968ccf73ccc4c2f83dadc6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:39:15 +0200 Subject: [PATCH 07/26] dbus-glib-host: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/devel/dbus-glib-host/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/devel/dbus-glib-host/build b/packages/devel/dbus-glib-host/build index 76f45ceaa2..663f599100 100755 --- 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 \ From 679f833fed5b32051d09f53332e098aca74b860a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:39:15 +0200 Subject: [PATCH 08/26] eggdbus-host: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/devel/eggdbus-host/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/devel/eggdbus-host/build b/packages/devel/eggdbus-host/build index e2143ea39f..05d64e1a8f 100755 --- 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 \ From 2f61c07dd9e85ba3d9d1321b18a354a4ebb505a4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:39:15 +0200 Subject: [PATCH 09/26] file-host: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/devel/file-host/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/devel/file-host/build b/packages/devel/file-host/build index 0cb938066b..a46deada5c 100755 --- 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 \ From 7009c504fcaf844af49a45256cc50b34a9c9f839 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:40:45 +0200 Subject: [PATCH 10/26] glib-hosttools: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/devel/glib-host/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/devel/glib-host/build b/packages/devel/glib-host/build index b7b2d34f1b..fb63d840d5 100755 --- 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 \ From 4fc2cd3c65ee6f58b040b937e83efc09236ba3e4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:40:45 +0200 Subject: [PATCH 11/26] llvm-host: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/devel/llvm-host/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/devel/llvm-host/build b/packages/devel/llvm-host/build index 745146e807..0d25e7cbbb 100755 --- 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 \ From 9dcb2774ddeef0ea7fed4edf7a9f44e9c893f342 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:40:45 +0200 Subject: [PATCH 12/26] ncurses: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/devel/ncurses/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/devel/ncurses/build b/packages/devel/ncurses/build index d1b1c7f2a5..79c6bc9a4b 100755 --- 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 From 0b692b5bd874aaa0e4d5f485b9699179c52763d2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:40:46 +0200 Subject: [PATCH 13/26] Python: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/lang/Python/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/lang/Python/build b/packages/lang/Python/build index 8262b4f9e4..e471108338 100755 --- 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 \ From 9cd26fe9ef8d494faa568a77383e79b8bc075686 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:42:15 +0200 Subject: [PATCH 14/26] libIDL-host: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/other/libIDL-host/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/other/libIDL-host/build b/packages/other/libIDL-host/build index e6b2a2e2d7..e3ce55cf26 100755 --- 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 From b847ac0643943ff13f5a785af783105043dfd1df Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:42:15 +0200 Subject: [PATCH 15/26] dbus-host: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/sysutils/dbus-host/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/sysutils/dbus-host/build b/packages/sysutils/dbus-host/build index ac2bc566b6..745a2878f8 100755 --- 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 \ From c3eb5bec84ca45c0b155d8c9eee506dea8f83038 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:42:15 +0200 Subject: [PATCH 16/26] expat-host: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/textproc/expat-host/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/textproc/expat-host/build b/packages/textproc/expat-host/build index ae4afcd574..debe573ccd 100755 --- 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 \ From cc248be368bfaba2c1f1f9cecf8885dad8a6b1c7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:42:15 +0200 Subject: [PATCH 17/26] libxml2-host: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/textproc/libxml2-host/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/textproc/libxml2-host/build b/packages/textproc/libxml2-host/build index ec7244c390..7353c7701e 100755 --- 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 From 08b28771333b0abe7d0cb49c3b26c0e56c7907af Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:43:51 +0200 Subject: [PATCH 18/26] cpio: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/toolchain/archivers/cpio/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/toolchain/archivers/cpio/build b/packages/toolchain/archivers/cpio/build index a7263ddde3..cfc773f7b8 100755 --- 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 From e1ca7927120320830938be6436227c29ce9faead Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:43:51 +0200 Subject: [PATCH 19/26] pkg-config: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/toolchain/devel/pkg-config/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/toolchain/devel/pkg-config/build b/packages/toolchain/devel/pkg-config/build index aee7975eba..d71c51c390 100755 --- 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 From 91f95f9e7870e2b316b487844c8bb5cacae5820c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:43:51 +0200 Subject: [PATCH 20/26] nasm: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/toolchain/lang/nasm/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/toolchain/lang/nasm/build b/packages/toolchain/lang/nasm/build index a7263ddde3..cfc773f7b8 100755 --- 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 From 72c71ccfaeeb2e994347428f0151c5c050e3e11f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:43:51 +0200 Subject: [PATCH 21/26] yasm: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/toolchain/lang/yasm/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/toolchain/lang/yasm/build b/packages/toolchain/lang/yasm/build index 85f133d5d1..360deed2e1 100755 --- 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 \ From 4ee6e7bae90de48a248e7ae42e4210157979d28d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:44:54 +0200 Subject: [PATCH 22/26] font-util-host: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/x11/font/font-util-host/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/x11/font/font-util-host/build b/packages/x11/font/font-util-host/build index 4e17859b7b..ebafc2c31c 100755 --- 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 From 5c2183af7ad5a6a4d163407e901dd8fbd4b29d44 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:44:55 +0200 Subject: [PATCH 23/26] xproto-host: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/x11/proto/xproto-host/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/x11/proto/xproto-host/build b/packages/x11/proto/xproto-host/build index d509c93772..300075ae95 100755 --- 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 From 6bf33bb0917ac285ae1d8a5162941e9b22960dfa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 01:44:55 +0200 Subject: [PATCH 24/26] makedepend: setup host triplet for --build and --host options to configure script Signed-off-by: Stephan Raue --- packages/x11/util/makedepend/build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/x11/util/makedepend/build b/packages/x11/util/makedepend/build index 4399555a39..db4d2ae0e7 100755 --- 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 From c83a2f8b5410aef3f638c357fec008937081195c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 02:38:39 +0200 Subject: [PATCH 25/26] config/path: set proper HOST_NAME host triplet with help from local gcc Signed-off-by: Stephan Raue --- config/path | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/path b/config/path index 939f4891b8..08ed070158 100644 --- 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 From e83551cf716612e33487260bcbbcd56831f518ca Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 13 Jul 2011 03:09:12 +0200 Subject: [PATCH 26/26] config/optimize: add distribution specific libdirs to HOST_LDFLAGS Signed-off-by: Stephan Raue --- config/optimize | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/config/optimize b/config/optimize index fd6bd4a7b1..a7853f4b68 100644 --- 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