diff options
| author | Chris Johns <chrisj@rtems.org> | 2019-07-23 21:47:53 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2019-07-23 21:47:53 +1000 |
| commit | 5eb4282eb44011cc2b5d79de0e4a73dd0361c41d (patch) | |
| tree | 67bde1d4e55b2378c11bb1e2c2e8c4a477ee66b0 | |
| parent | rtems/bsp: Build packages for the beagle BSP. (diff) | |
| download | rtems-source-builder-5eb4282eb44011cc2b5d79de0e4a73dd0361c41d.tar.bz2 | |
devel/sis: Fix building the SIS on FreeBSD
- Update to SIS 2.17 which has internal readline support for
the hosts which do not have readline.
Closes #3763
| -rw-r--r-- | bare/config/devel/sis-2-1.cfg | 5 | ||||
| -rw-r--r-- | rtems/config/5/rtems-riscv.bset | 2 | ||||
| -rw-r--r-- | rtems/config/5/rtems-sparc.bset | 3 | ||||
| -rw-r--r-- | source-builder/config/sis-2-1.cfg | 17 |
4 files changed, 9 insertions, 18 deletions
diff --git a/bare/config/devel/sis-2-1.cfg b/bare/config/devel/sis-2-1.cfg index ad6e527..c896522 100644 --- a/bare/config/devel/sis-2-1.cfg +++ b/bare/config/devel/sis-2-1.cfg @@ -8,11 +8,10 @@ %include %{_configdir}/base.cfg -%define sis_version 2.16 -%hash sha256 sis-%{sis_version}.tar.bz2 37cdb8f5cc1255e273423f580f5c76755e5851dabb677f6bc1100f27557b8dce +%define sis_version 2.17 +%hash sha256 sis-%{sis_version}.tar.bz2 5125a8924688223b8341c2c26f51490069035da764e43f422c3fc119ddcae1a3 # # The sis build instructions. We use 2.15 # %include %{_configdir}/sis-2-1.cfg - diff --git a/rtems/config/5/rtems-riscv.bset b/rtems/config/5/rtems-riscv.bset index bff4c44..a7964ef 100644 --- a/rtems/config/5/rtems-riscv.bset +++ b/rtems/config/5/rtems-riscv.bset @@ -14,4 +14,4 @@ tools/rtems-gdb-8.2.1-1 tools/rtems-binutils-2.32 tools/rtems-gcc-9.1.0-newlib-5c2a3661c tools/rtems-tools-5-1 -devel/sis-2-1.cfg +devel/sis-2-1 diff --git a/rtems/config/5/rtems-sparc.bset b/rtems/config/5/rtems-sparc.bset index 23ddaca..60bb792 100644 --- a/rtems/config/5/rtems-sparc.bset +++ b/rtems/config/5/rtems-sparc.bset @@ -2,5 +2,4 @@ %define rtems_arch sparc %define with_libgomp %include 5/rtems-default.bset -devel/sis-2-1.cfg - +devel/sis-2-1 diff --git a/source-builder/config/sis-2-1.cfg b/source-builder/config/sis-2-1.cfg index a07b2db..9875728 100644 --- a/source-builder/config/sis-2-1.cfg +++ b/source-builder/config/sis-2-1.cfg @@ -31,26 +31,19 @@ Release: %{release} cd sis-%{sis_version} - ac_prefix=%{_prefix} - - if test "%{_build}" != "%{_host}" ; then - CFLAGS_FOR_BUILD="-g -O2 -Wall" - fi - export CFLAGS CFLAGS_FOR_BUILD CC - if test "%{_target}" != "" ; then SIS_PREFIX="%{_target}-" fi - CFLAGS="$SB_CFLAGS" \ + + %{host_build_flags} + ./configure \ - --build=%{_build} --host=%{_host} \ + --build=%{_build} --host=%{_host} --target=%{_target} \ --program-prefix="$SIS_PREFIX" \ - --prefix=${ac_prefix} + --prefix=${_prefix} %{__make} %{?_smp_mflags} all - unset CFLAGS_FOR_BUILD - cd ${build_top} %install |