Changeset c799e04 in rtems-source-builder


Ignore:
Timestamp:
07/06/19 09:20:09 (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
5, master
Children:
8922c8b
Parents:
bcfb210
git-author:
Chris Johns <chrisj@…> (07/06/19 09:20:09)
git-committer:
Chris Johns <chrisj@…> (07/21/19 11:09:34)
Message:

5/packages: Add curl and update all packages with RTEMS 5 and LibBSD

  • Update rtems-bsp support to correctly handle hosts for BSP.
  • Clean up the options for a BSP.
  • Check all RTEMS 5 packages and add 5/rtems-packages for all that build.
  • Update download locations and checksum of all packages.
  • The work requires the kernel and Libbsd hacve the same prefix.
Files:
6 added
24 edited

Legend:

Unmodified
Added
Removed

  • rtems/config/databases/sqlite-3.8.8.1-1.cfg

    rbcfb210 rc799e04  
    2020%define sqlite_src_year    2015
    2121
    22 %hash md5 sqlite-src-%{sqlite_src_version}.zip 9dde57c312da00cbe791bcba42d1e96a
     22%hash sha512 sqlite-src-%{sqlite_src_version}.zip 4f09228cb0c9c608e492da6e480afe3d27a63e27ccdcf33a88d5e56427f0846efab8930c81026b8e608f1bbb8d63e8d937dd26571deb828617f7efa27a765950
    2323
    2424#

  • rtems/config/graphics/freetype-2.4.10-1.cfg

    rbcfb210 rc799e04  
    1414%define freetype_version 2.4.10
    1515
    16 %hash md5 freetype-%{freetype_version}.tar.gz 4f255c6ee5d5cc2b5c3d423a07386fcb
     16%hash sha512 freetype-%{freetype_version}.tar.gz 507d1c03d394b695b5a96041ad7ee03b375964c89f007678db864a7e5bd2ee69d83e6c638f4aadaf348c921d37c16741a03ef9bee03196bda2b94ceea409b688
    1717
    1818#

  • rtems/config/graphics/graphics-all.bset

    rbcfb210 rc799e04  
    33#
    44
     5graphics/freetype2
    56graphics/libjpeg
    67graphics/libpng
    78graphics/libtiff
    89graphics/t1lib
    9 graphics/microwindows.bset
     10
     11# Remove as microwindows does not build. Please fix and provide a patch.
     12# graphics/microwindows

  • rtems/config/graphics/libjpeg-9a-1.cfg

    rbcfb210 rc799e04  
    1414%define libjpeg_version 9a
    1515
    16 %hash md5 jpegsrc.v%{libjpeg_version}.tar.gz 3353992aecaee1805ef4109aadd433e7
     16%hash sha512 jpegsrc.v%{libjpeg_version}.tar.gz 9b21cc115e22c68bea46db462263c5c7a0d10beb192a919ecccbd801a25982b518ce44d8c301dd582ecaba1850e0e0f20e322be82b0e24ae917b9949b4f10d3b
    1717
    1818#

  • rtems/config/graphics/libpng.bset

    rbcfb210 rc799e04  
    1313# Build libpng.
    1414#
    15 graphics/libpng-1.6.21-1.cfg
     15graphics/libpng-1.6.37-1.cfg

  • rtems/config/graphics/libtiff-4.0.6-1.cfg

    rbcfb210 rc799e04  
    1414%define tiff_version 4.0.6
    1515
    16 %hash md5 tiff-%{tiff_version}.tar.gz d1d2e940dea0b5ad435f21f03d96dd72
     16%hash sha512 tiff-%{tiff_version}.tar.gz 2c8dbaaaab9f82a7722bfe8cb6fcfcf67472beb692f1b7dafaf322759e7016dad1bc58457c0f03db50aa5bd088fef2b37358fcbc1524e20e9e14a9620373fdf8
    1717
    1818#

  • rtems/config/graphics/libtiff.bset

    rbcfb210 rc799e04  
    1313# Build libtiff.
    1414#
    15 graphics/libtiff-4.0.6-1.cfg
     15graphics/libtiff-4.0.10-1.cfg

  • rtems/config/graphics/microwindows-0.93-dev-1.cfg

    rbcfb210 rc799e04  
    1212# microwindows Version
    1313#
    14 %define microwindows_version 0.93-dev
     14%define microwindows_version 56041759161132a94df3e575ae995e53d6b6e1d8
    1515
    1616%define rtems_git_tools_4_11 %{rtems_http_git}/rtems-tools/plain/tools/4.11
    1717
    18 %source set microwindows git://github.com/ghaerr/microwindows.git
     18%hash sha512 microwindows-%{microwindows_version}.tar.gz cf29a9d966a8a5b3926aab7f911c47890c9b1a589ff0ecf098e6be45ae1555958b0e437270fb26e353b8c58f261834a3a7f0fce84bea0fdb9138fc38c8703ddc
     19
    1920%patch add microwindows %{rtems_git_tools_4_11}/microwindows/microwindows-0.93-dev.diff
    20 %hash md5 microwindows-0.93-dev.diff 5b06e77d9ee42c8ff0032bba07d01c1a
    21 %patch add microwindows %{rtems_git_tools_4_11}/microwindows/microwindows-0.93-dev-without-keyboard.diff
    22 %hash md5 microwindows-0.93-dev-without-keyboard.diff a675f55750754e1cd82a17496f0e8fab
     21%hash sha512 microwindows-0.93-dev.diff 2f575f603ce9ccff5c98e9c434d72fb9952d1385903495bf818d50de6568c57c9ca1d3320388e3bae384388d192a389012baf4d734d2cc8481d56f231d2a93d0
     22
     23#%patch add microwindows %{rtems_git_tools_4_11}/microwindows/microwindows-0.93-dev-without-keyboard.diff
     24#%hash sha512 microwindows-0.93-dev-without-keyboard.diff c235177fa80035ec70957aee1daa9232c9050abddac08e5f7b2977bd58703224367b4262a2ddc2999b1ac64b5ab838ad3ad740ee1490741293cffe7c16575fb2
    2325
    2426#

  • rtems/config/graphics/t1lib-5.1.2-1.cfg

    rbcfb210 rc799e04  
    1414%define t1lib_version 5.1.2
    1515
    16 %hash md5 t1lib-%{t1lib_version}.tar.gz a5629b56b93134377718009df1435f3c
     16%hash sha512 t1lib-%{t1lib_version}.tar.gz 9f424b19c6f35cc4f194ff7351a4c2352216462c7d1b1d9650ad3a05cf48c6e90c89ccbcda5ecc47a4169a39a850cf84a1fcbf88b3b15614860c27364b631ae3
    1717
    1818#
    … …  
    2020#
    2121%patch add t1lib https://raw.githubusercontent.com/yangqiao/rtems-tools/graphics/tools/4.11/t1lib/t1lib-5.1.2.diff
    22 %hash md5 t1lib-5.1.2.diff 98eeed85780227adf8525deab3679877
     22%hash sha512 t1lib-5.1.2.diff 1afd18182350d7d2426a910c61537f8532e149bf37c616f3a4a84ae0767c4549a2be857db6fd1b1994ed86f8a2e2d4cdfb2abdf67053c8ca1ee83893f4b56d23
    2323
    2424#

  • rtems/config/net-mgmt/net-snmp-5.7.2.1-1.cfg

    rbcfb210 rc799e04  
    1414%define net_snmp_version 5.7.2.1
    1515
    16 %hash md5 net-snmp-%{net_snmp_version}.tar.gz 7db683faba037249837b226f64d566d4
     16%hash sha512 net-snmp-%{net_snmp_version}.tar.gz 6c4dadd145cab9572e2559ad99d6794469685086771c6d757d3667da1a061ab86746d53c28d48381c59a90d92b1812b813f3176cff156c41929177fb585299d0
    1717
    1818#
    … …  
    2424# Patch for RTEMS support.
    2525#
    26 %patch add net-snmp %{rtems_git_tools}/net-snmp/rtems-net-snmp-5.7.2.1-20140623.patch
    27 %hash  md5 rtems-net-snmp-5.7.2.1-20140623.patch 9a22fb4366a113f5df71ed2acd672b2b
     26%patch add net-snmp %{rtems_git_tools}/net-snmp/rtems-net-snmp-5.7.2.1-20190704.patch
     27#%hash  sha512 rtems-net-snmp-5.7.2.1-20140623.patch 4eb987d88c6414f2e07d725c2ebb3e88a40191c7befce879cae9ef67143dc25aa88942cfc525d36cd3683476d1cc0f5882d4a730d3bb9c53be2c7a079874d7dd
    2828
    2929#

  • rtems/config/net/lwip-1-1.cfg

    rbcfb210 rc799e04  
    1212# LWIP Version
    1313#
    14 %define lwip_version lwip-c2ebf5544b4268eac9b32c7f3a689ff646d96eef
     14%define lwip_version c2ebf5544b4268eac9b32c7f3a689ff646d96eef
     15%hash sha512 lwip-%{lwip_version}.tar.gz bfa93e050133ca591c628f0e3a04f5082f55a655b099cdd49138ebf74494354a4cbbee56839f5939174b4c965b29ec648c24b7479c73393ac94ec536cb578b70
    1516
    16 #Will be modified to be pointing to RTEMS repo
     17#
     18# Will be modified to be pointing to RTEMS repo
     19#
    1720%define rtems_ragu_git https://raw.githubusercontent.com/ragunath3252/lwip-nodrv/master
     21
    1822#
    1923# Patch for RTEMS support.
    2024#
    21 %patch add lwip %{rtems_ragu_git}/rtems.patch
    22 %hash  md5 rtems.patch 489c0def3a89e538fb526a5396bf27ca
     25%patch add lwip --rsb-file=lwip-nodrv-rtems.patch %{rtems_ragu_git}/rtems.patch
     26%hash sha512 lwip-nodrv-rtems.patch ba49163e11069cb036280023db064625e5d1aed3a6cf3e51c64e59639580e9f758434e60853242fb924eb5cebc73b478f01ff51f24505e85d4c21bb1963415e1
    2327
    2428#

  • rtems/config/net/ntp-4.2.6p5-1.cfg

    rbcfb210 rc799e04  
    1414%define ntp_version 4.2.6p5
    1515
    16 %hash md5 ntp-%{ntp_version}.tar.gz 00df80a84ec9528fcfb09498075525bc
     16%hash sha512 ntp-%{ntp_version}.tar.gz 8d76fc7e92b2ea6dd5031e6030a7aba4ff6fb3e19d3bc0153852509861be5d0960e70604814163caedb81f8315a451d78371f99634a50b55cfe1cbd2c69e3046
    1717
    1818#
    1919# Patch for RTEMS support.
    2020#
    21 %patch add ntp %{rtems_git_tools}/ntp/rtems-ntp-4.2.6p5.diff
    22 %hash  md5 rtems-ntp-4.2.6p5.diff 6fce685a73873f924a48b19d6b1700fc
     21%patch add ntp %{rtems_http_git}/rtems-tools/plain/tools/4.11/ntp/rtems-ntp-4.2.6p5.diff
     22%hash  sha512 rtems-ntp-4.2.6p5.diff 257223d207d0b77cde2b9d7add22e3b9d657b58998411d2e20d0b1adf36910be21f1277386c54c34f5d9616fccd29f721d007295708047ea7ae0270a00be25a0
    2323
    2424#

  • rtems/config/net/protobuf-2.6.1-1.cfg

    rbcfb210 rc799e04  
    1414%define protobuf_version 2.6.1
    1515
    16 %hash md5 protobuf-%{protobuf_version}.tar.gz f3916ce13b7fcb3072a1fa8cf02b2423
     16%hash sha512 protobuf-%{protobuf_version}.tar.gz 818ac4ad24aca84d214d14ac860a75c14494528821af144d3cb603f69c94d4500512814be6d62cc82973804ebfa99eb94d9f034b309f53cadb622603a7886a3e
    1717
    1818#

  • rtems/config/rtems-bsp.cfg

    rbcfb210 rc799e04  
    44
    55#
    6 # The RTEMS BSP support requires the host turple, the RTEMS BSP and the path to
     6# The RTEMS BSP support requires the host tuple, the RTEMS BSP and the path to
    77# the tools. The prefix is set to an installed RTEMS. The built package is
    88# installed into the prefix.
    99#
    1010# Keeping the package's installed path in the RTEMS install path and separate
    11 # to the tools lets the tools version vary independently. If --rtems-tools
    12 # (--with-tools) is not provided use the prefix.
     11# to the tools lets the tools version vary independently.
     12#
     13# Provide the path to the RTEMS tools is not in the prefix with the
     14# --with-tools option. If --with-tools is not provided use the prefix.
     15#
     16# Provide the path to the installed RTEMS kernel is not in the prefix with the
     17# --with-rtems option. If --with-rtems is not provided use the prefix.
     18#
     19# Note, only a single path (--with-rtems) for the RTEMS kernel and any other
     20# add on or 3rd party libraries is supported.
    1321#
    1422
    … …  
    2432%endif
    2533
    26 %if %{_target} == %{nil} && %{rtems_bsp_error}
    27  %error No RTEMS target specified: --rtems-bsp=arch/bsp (or --target=target)
     34#
     35# The target is used by compilers or Cxc builds.
     36#
     37%if %{_target} != %{nil}
     38 %error RTEMS BSP builds use --host and not --target
    2839%endif
    2940
    30 %if %{_host} != %{_build}
    31  %error Canadian cross building for BSP is not supported.
     41#
     42# We need a host from the user to specifiy the RTEMS architecture and major
     43# version.
     44#
     45%if %{_host} == %{nil} && %{rtems_bsp_error}
     46 %error No RTEMS host or BSP specified: --host=<arch>-rtems<ver>
    3247%endif
    3348
     49#
     50# We need a BSP from the user.
     51#
    3452%ifn %{defined with_rtems_bsp}
    3553 %if %{rtems_bsp_error}
    … …  
    3957%endif
    4058
     59#
     60# If no tools or RTEMS provided use the prefix.
     61#
    4162%ifn %{defined with_tools}
    4263 %define with_tools %{_prefix}
    4364%endif
    4465
    45 #
    46 # Set the host to the target.
    47 #
    48 %define _host %{_target}
     66%ifn %{defined with_rtems}
     67 %define with_rtems %{_prefix}
     68%endif
    4969
    5070#
    … …  
    5878# warning from the flags that RTEMS exports.
    5979#
    60 %{pkgconfig prefix %{_prefix}/lib/pkgconfig}
     80%{pkgconfig prefix %{with_rtems}/lib/pkgconfig}
    6181%{pkgconfig crosscompile yes}
    6282%{pkgconfig filter-flags yes}
    … …  
    6585# The RTEMS BSP Flags
    6686#
    67 %define rtems_bsp           %{with_rtems_bsp}
    68 %define rtems_bsp_ccflags   %{pkgconfig ccflags %{_host}-%{rtems_bsp}}
    69 %define rtems_bsp_cflags    %{pkgconfig cflags  %{_host}-%{rtems_bsp}}
    70 %define rtems_bsp_ldflags   %{pkgconfig ldflags %{_host}-%{rtems_bsp}}
    71 %define rtems_bsp_libs      %{pkgconfig libs    %{_host}-%{rtems_bsp}}
     87%define rtems_bsp         %{with_rtems_bsp}
     88%define rtems_bsp_ccflags %{pkgconfig ccflags %{_host}-%{rtems_bsp}}
     89%define rtems_bsp_cflags  %{pkgconfig cflags  %{_host}-%{rtems_bsp}}
     90%define rtems_bsp_ldflags %{pkgconfig ldflags %{_host}-%{rtems_bsp}}
     91%define rtems_bsp_libs    %{pkgconfig libs    %{_host}-%{rtems_bsp}}
    7292
    7393%if %{rtems_bsp_cflags} == %{nil} && %{rtems_bsp_error}
    74  %error No RTEMS target CFLAGS found; Please check the --rtems-bsp option.
     94 %error No RTEMS BSP CFLAGS found; Please check the --rtems-bsp option.
    7595%endif
    7696
    7797%if %{rtems_bsp_ccflags} == %{nil}
    7898 %define rtems_bsp_ccflags %{rtems_bsp_cflags}
     99%endif
     100
     101#
     102# RTEMS BSP paths
     103#
     104%define rtems_bsp_cc      %{_host}-gcc
     105%define rtems_bsp_incpath %{with_rtems}/%{_host}/%{rtems_bsp}/include
     106%define rtems_bsp_libpath %{with_rtems}/%{_host}/%{rtems_bsp}/lib
     107
     108#
     109# Check for installed libraries.
     110#
     111# - Check is LibBSD is install
     112# - Add librtemsdefaultconfig so configure scripts work.
     113#
     114# Note: default BSP flags include the standard RTEMS libraries.
     115#
     116%define rtems-dep-check %(%{_sbdir}/sb/rtems-build-dep -c %{with_tools}/bin/%{rtems_bsp_cc}
     117
     118%define rtems-libbsd %{rtems-dep-check} -L %{rtems_bsp_libpath} -l libbsd.a)
     119%if %{rtems-libbsd} == found
     120 %define rtems_bsp_libs %{rtems_bsp_libs} -lbsd -lm -lz
     121%endif
     122
     123%define rtems-defaultconfig %{rtems-dep-check} -L %{rtems_bsp_libpath} -l librtemsdefaultconfig.a)
     124%if %{rtems-defaultconfig} == found
     125 %define rtems_bsp_libs %{rtems_bsp_libs} -lrtemsdefaultconfig
    79126%endif
    80127

  • source-builder/config/libpng-1.cfg

    rbcfb210 rc799e04  
    1818# libpng Source
    1919#
    20 %source set libpng ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng%{libpng_src_dir_revision}/libpng-%{libpng_version}.tar.gz
     20#%source set libpng ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng%{libpng_src_dir_revision}/libpng-%{libpng_version}.tar.gz
     21
     22%source set libpng --rsb-file=libpng-%{libpng_version}.tar.xz http://prdownloads.sourceforge.net/libpng/libpng-%{libpng_version}.tar.xz?download
    2123
    2224#

  • source-builder/config/libtiff-1.cfg

    rbcfb210 rc799e04  
    1818# libtiff Source
    1919#
    20 %source set libtiff ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{tiff_version}.tar.gz
     20%source set libtiff http://download.osgeo.org/libtiff/tiff-%{tiff_version}.tar.gz
    2121
    2222#

  • source-builder/config/lwip-1.cfg

    rbcfb210 rc799e04  
    1818# LWIP Source
    1919#
    20 %source set lwip git://git.sv.gnu.org/lwip.git?fetch?reset=hard?branch=master?checkout=c2ebf5544b4268eac9b32c7f3a689ff646d96eef
     20%source set lwip http://git.savannah.gnu.org/cgit/lwip.git/snapshot/lwip-%{lwip_version}.tar.gz
     21
    2122#
    2223# Prepare the source code.
    … …  
    2526  build_top=$(pwd)
    2627
    27   source_dir_lwip="%{lwip_version}"
    28   %source setup lwip -q -n %{lwip_version}
     28  source_dir_lwip="lwip-%{lwip_version}"
     29  %source setup lwip -q -n lwip-%{lwip_version}
    2930  %patch setup lwip -p1
    3031
    … …  
    4142  %{host_build_flags}
    4243
    43   cd ${build_top}/%{lwip_version}
     44  cd ${build_top}/lwip-%{lwip_version}
    4445  export RTEMS_MAKEFILE_PATH=%{_exec_prefix}
    4546  %{__make} all
    … …  
    4849
    4950#%install
    50   build_top=$(pwd)/%{lwip_version}
     51  build_top=$(pwd)/lwip-%{lwip_version}
    5152
    5253  %{__make} install

  • source-builder/config/microwindows-1.cfg

    rbcfb210 rc799e04  
    99%endif
    1010
    11 Name:      microwindows-v%{microwindows_version}-%{_host}-%{release}
     11Name:      microwindows-%{microwindows_version}-%{_host}-%{release}
    1212Summary:   microwindows is an Open Source Window System
    1313Version:   %{microwindows_version}
    1414Release:   %{release}
    15 URL:     http://www.microwindows.org/
     15URL:       http://www.microwindows.org/
    1616
    1717#
    1818# microwindows Source
    1919#
    20 %source set microwindows ftp://microwindows.censoft.com/pub/microwindows/microwindows-src-%{microwindows_version}.tar.gz
     20%source set microwindows --rsb-file=microwindows-%{microwindows_version}.tar.gz https://codeload.github.com/ghaerr/microwindows/tar.gz/%{microwindows_version}
    2121
    2222#
    … …  
    2626  build_top=$(pwd)
    2727
    28   source_dir_microwindows="microwin"
    29   %source setup microwindows -q -n microwin
     28  source_dir_microwindows="microwindows-%{microwindows_version}"
     29  %source setup microwindows -q -n microwindows-%{microwindows_version}
    3030  %patch setup microwindows -p1
    3131

  • source-builder/config/net-snmp-5-1.cfg

    rbcfb210 rc799e04  
    4444  CFLAGS="${CFLAGS} %{net_snmp_cflags}"
    4545
     46  LIBS="-lbsd -lm -lz -lrtemsdefaultconfig" \
    4647  ../${source_dir_net_snmp}/configure \
    4748    --host=%{_host} \

  • source-builder/config/t1lib-1.cfg

    rbcfb210 rc799e04  
    1818# t1lib Source
    1919#
    20 %source set t1lib ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/t1lib-%{t1lib_version}.tar.gz
     20%source set t1lib http://ftp.netbsd.org/pub/pkgsrc/distfiles/t1lib-%{t1lib_version}.tar.gz
    2121
    2222#

  • source-builder/defaults.mc

    rbcfb210 rc799e04  
    6565# flags and include paths to the tools. The host is the final platform
    6666# the tools will run on and build is the host building the tools.
    67 host_cflags:         none,    convert,  '-O2 -pipe'
    68 host_cxxflags:       none,    convert,  '-O2 -pipe'
     67host_cflags:         none,    convert,  '-O2 -g -pipe'
     68host_cxxflags:       none,    convert,  '-O2 -g -pipe'
    6969host_ldflags:        none,    convert,  ''
    7070host_includes:       none,    convert,  ''
    71 build_cflags:        none,    convert,  '-O2 -pipe'
    72 build_cxxflags:      none,    convert,  '-O2 -pipe'
     71host_libs:           none,    convert,  ''
     72build_cflags:        none,    convert,  '-O2 -g -pipe'
     73build_cxxflags:      none,    convert,  '-O2 -g -pipe'
    7374build_ldflags:       none,    convert,  ''
    7475build_includes:      none,    convert,  ''
     76build_libs:          none,    convert,  ''
    7577
    7678# Extra path a platform can override.
    … …  
    204206# host == build, use build; host != build, host uses host and build uses build
    205207SB_HOST_CPPFLAGS="%{host_includes}"
    206 SB_HOST_CFLAGS="%{host_cflags} %{host_includes}"
    207 SB_HOST_CXXFLAGS="%{host_cxxflags} %{host_includes}"
     208# Optionally do not add includes to c/cxx flags as newer configure's complain
     209SB_HOST_CFLAGS="%{host_cflags} %{!?host_cflags_no_includes %{host_includes}}"
     210SB_HOST_CXXFLAGS="%{host_cxxflags} %{!?host_cflags_no_includes %{host_includes}}"
    208211SB_HOST_LDFLAGS="%{host_ldflags} %{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}"
     212SB_HOST_LIBS="%{host_libs}"
    209213SB_BUILD_CFLAGS="%{build_cflags} %{?_tmproot:-I%{_tmproot}/${SB_PREFIX_CLEAN}/include}"
    210214SB_BUILD_CXXFLAGS="%{build_cxxflags} %{?_tmproot:-I%{_tmproot}/${SB_PREFIX_CLEAN}/include}"
    211215SB_BUILD_LDFLAGS="%{build_ldflags} %{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}"
     216SB_BUILD_LBS="%{build_libs}"
    212217SB_CFLAGS="${SB_BUILD_CFLAGS} %{build_includes}"
    213218SB_CXXFLAGS="${SB_BUILD_CXXFLAGS} %{build_includes}"
    … …  
    215220SB_OS="%{_os}"
    216221export SB_SOURCE_DIR SB_BUILD_DIR SB_ARCH SB_OS
    217 export SB_HOST_CPPFLAGS SB_HOST_CFLAGS SB_HOST_CXXFLAGS SB_HOST_LDFLAGS
    218 export SB_BUILD_CFLAGS SB_BUILD_CXXFLAGS SB_BUILD_LDFLAGS
     222export SB_HOST_CPPFLAGS SB_HOST_CFLAGS SB_HOST_CXXFLAGS SB_HOST_LDFLAGS SB_HOST_LIBS
     223export SB_BUILD_CFLAGS SB_BUILD_CXXFLAGS SB_BUILD_LDFLAGS SB_BUILD_LIBS
    219224export SB_CFLAGS SB_CXXFLAGS
    220225# Documentation
    … …  
    327332  CXXFLAGS="${SB_HOST_CXXFLAGS}"
    328333  LDFLAGS="${SB_HOST_LDFLAGS}"
     334  LIBS="${SB_HOST_LIBS}"
    329335  # Host
    330336  CPPFLAGS_FOR_HOST="${SB_HOST_CPPFLAGS}"
    … …  
    332338  CXXFLAGS_FOR_HOST="${SB_HOST_CXXFLAGS}"
    333339  LDFLAGS_FOR_HOST="${SB_HOST_LDFLAGS}"
     340  LIBS_FOR_HOST="${SB_HOST_LIBS}"
    334341  CXXFLAGS_FOR_HOST="${SB_HOST_CFLAGS}"
    335342  CC_FOR_HOST=$(echo "%{_host_cc} ${SB_HOST_CFLAGS}" | sed -e 's,-std=gnu99 ,,')
    … …  
    339346  CXXFLAGS_FOR_BUILD="${SB_BUILD_CXXFLAGS}"
    340347  LDFLAGS_FOR_BUILD="${SB_BUILD_LDFLAGS}"
     348  LIBS_FOR_BUILD="${SB_BUILD_LIBS}"
    341349  CXXFLAGS_FOR_BUILD="${SB_BUILD_CFLAGS}"
    342350  CC_FOR_BUILD=$(echo "%{__cc} ${SB_BUILD_CFLAGS}" | sed -e 's,-std=gnu99 ,,')
    … …  
    344352else
    345353  LDFLAGS="${SB_BUILD_LDFLAGS}"
     354  LIBS="${SB_BUILD_LIBS}"
    346355  CC=$(echo "%{__cc} ${SB_BUILD_CFLAGS}" | sed -e 's,-std=gnu99 ,,')
    347356  CXX=$(echo "%{__cxx} ${SB_BUILD_CXXFLAGS}" | sed -e 's,-std=gnu99 ,,')
    … …  
    349358  CXX_FOR_BUILD=${CXX}
    350359fi
    351 export CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
    352 export CC_FOR_HOST CXX_FOR_HOST CPPFLAGS_FOR_HOST CFLAGS_FOR_HOST CXXFLAGS_FOR_HOST LDFLAGS_FOR_HOST
    353 export CC_FOR_BUILD CXX_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD'''
     360export CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS LIBS
     361export CC_FOR_HOST CXX_FOR_HOST CPPFLAGS_FOR_HOST CFLAGS_FOR_HOST CXXFLAGS_FOR_HOST LDFLAGS_FOR_HOST LIBS_FOR_HOST
     362export CC_FOR_BUILD CXX_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD LIBS_FOR_BUILS'''
    354363
    355364# Build/build flags.
    … …  
    358367# gcc is not ready to be compiled with -std=gnu99
    359368LDFLAGS="${SB_HOST_LDFLAGS}"
     369LIBS="${SB_HOST_LIBS}"
    360370CC=$(echo "%{__cc} ${SB_CFLAGS}" | sed -e 's,-std=gnu99 ,,')
    361371CXX=$(echo "%{__cxx} ${SB_CXXFLAGS}" | sed -e 's,-std=gnu99 ,,')
    362372CC_FOR_BUILD=${CC}
    363373CXX_FOR_BUILD=${CXX}
    364 export CC CXX CC_FOR_BUILD CXX_FOR_BUILD CFLAGS LDFLAGS'''
     374export CC CXX CC_FOR_BUILD CXX_FOR_BUILD CFLAGS LDFLAGS LIBS'''
    365375
    366376# Default package settings

  • source-builder/sb/options.py

    rbcfb210 rc799e04  
    421421        _build = self.defaults.expand('%{_build}')
    422422        _target = self.defaults.expand('%{_target}')
    423         if len(_target):
    424             return len(_host) and len(_build) and (_target) and \
    425                 _host != _build and _host != _target
    426         return len(_host) and len(_build) and _host != _build
     423        #
     424        # This has been removed to fix how RTEMS 3rd party libraries
     425        # are built. This may break Cxc tools builds.
     426        #
     427        # if len(_target):
     428        #     return len(_host) and len(_build) and (_target) and \
     429        #         _host != _build and _host != _target
     430        return len(_target) and len(_host) and len(_build) and _host != _build
    427431
    428432    def user_macros(self):

  • source-builder/sb/rtems-build-dep

    rbcfb210 rc799e04  
    142142#
    143143if [ ${op} = "library" ]; then
    144     if [ "${OS}" = "Windows_NT" -a "${OSTYPE}" -ne "cygwin" ]; then
     144    if [ "${OS}" = "Windows_NT" -a "${OSTYPE}" != "cygwin" ]; then
    145145        sep=';'
    146146    else

  • source-builder/sb/setbuilder.py

    rbcfb210 rc799e04  
    414414                        #
    415415                        log.trace('_bset: macros post-build')
    416                         log.trace(str(macros))
     416                        log.trace(str(b.macros))
    417417                    else:
    418418                        raise error.general('invalid config type: %s' % (configs[s]))
Note: See TracChangeset for help on using the changeset viewer.