Changeset 5eb4282 in rtems-source-builder

Timestamp:

07/23/19 11:47:53 (4 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

5, master

Children:

0e59b48

Parents:

831ae05

Message:

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

Files:

• bare/config/devel/sis-2-1.cfg (modified) (2 diffs)
• rtems/config/5/rtems-riscv.bset (modified) (1 diff)
• rtems/config/5/rtems-sparc.bset (modified) (1 diff)
• source-builder/config/sis-2-1.cfg (modified) (1 diff)

bare/config/devel/sis-2-1.cfg

@@ -9 +9 @@
 %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
 
 #
@@ -16 +16 @@
 #
 %include %{_configdir}/sis-2-1.cfg
-

rtems/config/5/rtems-riscv.bset

@@ -15 +15 @@
 tools/rtems-gcc-9.1.0-newlib-5c2a3661c
 tools/rtems-tools-5-1
-devel/sis-2-1.cfg
+devel/sis-2-1

rtems/config/5/rtems-sparc.bset

@@ -3 +3 @@
 %define with_libgomp
 %include 5/rtems-default.bset
-devel/sis-2-1.cfg
-
+devel/sis-2-1

source-builder/config/sis-2-1.cfg

@@ -32 +32 @@
   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}