diff options
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/machine/cyclone3_starter.conf | 7 | ||||
| -rw-r--r-- | recipes/gcc/gcc-configure-common.inc | 3 | ||||
| -rw-r--r-- | recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb | 1 | ||||
| -rw-r--r-- | recipes/tasks/task-shr-feed.bb | 1 | ||||
| -rw-r--r-- | recipes/uclibc/uclibc.inc | 7 | ||||
| -rw-r--r-- | site/nios2-linux-uclibc | 31 |
7 files changed, 50 insertions, 4 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 784a092264..298f1bca08 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -25286,6 +25286,10 @@ sha256=e56a77325cdea8c274a39fcb79bd47919cbafa15d8009176538ec9a94f5e6e13 md5=0ff6bde0f33b712d066cea08934d4808 sha256=e4f203a3370ef02684a320431cb71c28af3bc9084bd0af2d72889eb36a62da0d +[http://www.tangogps.org/downloads/tangogps-0.99.1.tar.gz] +md5=bf99c9510481681651434eb943fe3294 +sha256=9f1e85c4f90a13ceb66dc8c0e6a92561fb00a8b01f63558b01ae9efdff984a59 + [http://downloads.sourceforge.net/tapioca-voip/tapioca-0.3.9.tar.gz] md5=e88c400394c092c2688bb2d490c80ccb sha256=fb89ac4e8578adc140e19cb4929b200d2898e5a8373230f500c16e59c803cba1 diff --git a/conf/machine/cyclone3_starter.conf b/conf/machine/cyclone3_starter.conf new file mode 100644 index 0000000000..95276e710f --- /dev/null +++ b/conf/machine/cyclone3_starter.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: Altera Cyclone III FPGA Starter +#@DESCRIPTION: Machine configuration for a Altera Cyclone III FPGA Starter Kit + +TARGET_ARCH = "nios2" + +require conf/machine/include/nios2.inc diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc index efe8ee8787..53c7824650 100644 --- a/recipes/gcc/gcc-configure-common.inc +++ b/recipes/gcc/gcc-configure-common.inc @@ -13,6 +13,7 @@ OBJC_linux-uclibceabi ?= "" OBJC_linux-uclibc ?= "" OBJC_avr ?= "" OBJC ?= ",objc" +SHARED_LIBRARIES ?= "yes" # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran' FORTRAN ?= ",f77" @@ -23,7 +24,7 @@ EXTRA_OECONF_PATHS ?= "" EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ --with-gnu-ld \ - --enable-shared \ + ${@['--enable-shared', '--disable-shared'][ "$SHARED_LIBRARIES" != "no" ]} \ --enable-target-optspace \ --enable-languages=${LANGUAGES} \ --enable-threads=posix \ diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb index 95152f1b22..5ef4e4e6a8 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb @@ -28,6 +28,7 @@ set_arch() { x86_64*) ARCH=x86_64 ;; avr32*) ARCH=avr32 ;; bfin*) ARCH=blackfin ;; + nios2*) ARCH=nios2 ;; esac } diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 0a93d39079..39ba31d77d 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -242,4 +242,5 @@ RDEPENDS_${PN} += "\ sox \ mpg123 \ zile \ + speex \ " diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc index 88f62fa557..08f0381a8f 100644 --- a/recipes/uclibc/uclibc.inc +++ b/recipes/uclibc/uclibc.inc @@ -211,9 +211,10 @@ do_install() { oe_runmake "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" utils oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ install_utils - - # oe_runstrip needs +x on files - chmod +x ${D}/${base_libdir}/* + if [ "x$SHARED_LIBRARIESy" != "xnoy"; then + # oe_runstrip needs +x on files + chmod +x ${D}/${base_libdir}/* + fi if [ "${bindir}" != "/usr/bin" ]; then install -d ${D}${bindir} diff --git a/site/nios2-linux-uclibc b/site/nios2-linux-uclibc new file mode 100644 index 0000000000..3f3f516ce8 --- /dev/null +++ b/site/nios2-linux-uclibc @@ -0,0 +1,31 @@ +ac_cv_func_getpgrp_void=yes +ac_cv_func_setpgrp_void=yes +ac_cv_func_setgrent_void=yes +ac_cv_func_malloc_0_nonnull=yes +ac_cv_func_malloc_works=yes + +# these are already in common-uclibc +#ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} +#ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes} + +ac_cv_func_setvbuf_reversed=no +ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} +ac_cv_sizeof_char=${ac_cv_sizeof_char=1} +ac_cv_sizeof_int=${ac_cv_sizeof_int=4} +ac_cv_sizeof_long=${ac_cv_sizeof_long=4} +ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4} +ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8} +ac_cv_sizeof_short=${ac_cv_sizeof_short=2} +ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2} +ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4} +ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4} +ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8} + +ac_cv_sys_restartable_syscalls=yes +ac_cv_uchar=${ac_cv_uchar=no} +ac_cv_uint=${ac_cv_uint=yes} +ac_cv_ulong=${ac_cv_ulong=yes} +ac_cv_ushort=${ac_cv_ushort=yes} + +ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} + |