diff options
author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
---|---|---|
committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
tree | 4140720b20e8d641c11da882010d6130a75fef21 /toolchain/gcc/patches/4.8-linaro/100-uclibc-conf.patch | |
parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'toolchain/gcc/patches/4.8-linaro/100-uclibc-conf.patch')
-rw-r--r-- | toolchain/gcc/patches/4.8-linaro/100-uclibc-conf.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/4.8-linaro/100-uclibc-conf.patch b/toolchain/gcc/patches/4.8-linaro/100-uclibc-conf.patch new file mode 100644 index 000000000..ff9ad94f6 --- /dev/null +++ b/toolchain/gcc/patches/4.8-linaro/100-uclibc-conf.patch @@ -0,0 +1,33 @@ +--- a/contrib/regression/objs-gcc.sh ++++ b/contrib/regression/objs-gcc.sh +@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H + then + make all-gdb all-dejagnu all-ld || exit 1 + make install-gdb install-dejagnu install-ld || exit 1 ++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] ++ then ++ make all-gdb all-dejagnu all-ld || exit 1 ++ make install-gdb install-dejagnu install-ld || exit 1 + elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then + make bootstrap || exit 1 + make install || exit 1 +--- a/libjava/classpath/ltconfig ++++ b/libjava/classpath/ltconfig +@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- + + # Transform linux* to *-*-linux-gnu*, to support old configure scripts. + case $host_os in +-linux-gnu*) ;; ++linux-gnu*|linux-uclibc*) ;; + linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` + esac + +@@ -1247,7 +1247,7 @@ linux-gnuoldld* | linux-gnuaout* | linux + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux*) + version_type=linux + need_lib_prefix=no + need_version=no |