Changeset 1a768ef in rtems


Ignore:
Timestamp:
Aug 4, 2006, 9:49:35 AM (13 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
5adb73a
Parents:
808db8e
Message:

Updated to use common rather than base. More rpmbuild work arounds.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • contrib/mingw/build-rpms.sh

    r808db8e r1a768ef  
     1#! /bin/sh
    12#
    23# $Id$
     
    4041mingw32_tool_list="w32api libs $base_tool_list"
    4142
     43cygwin_cc_name="pc"
     44freebsd_cc_name="pc"
     45mingw32_cc_name="pc"
     46
    4247cygwin_cpu_list="i686"
    4348freebsd_cpu_list="i586"
    4449mingw32_cpu_list="i686"
    4550
    46 rpm_topdir=$(rpmbuild --showrc | grep "\?\?\: _topdir" | sed 's/.*:.*_topdir\t*//')
     51rpm_topdir=$(rpm --eval "%{_topdir}")
    4752
    4853prefix=/opt/rtems
     
    196201rpm_installer()
    197202{
    198  local rpm_bases=
     203 local rpm_common=
    199204 local rpm_libs=
    200205 local rpm_tools=
     
    219224 for r in $rpm_names
    220225 do
    221   if [ $(echo $r | sed 's/.*base.*/yes/') = yes ]; then
    222    rpm_bases="$rpm_bases $r"
     226  if [ $(echo $r | sed 's/.*common.*/yes/') = yes ]; then
     227   rpm_common="$rpm_common $r"
    223228  elif [ $(echo $r | sed 's/.*lib.*/yes/') = yes ]; then
    224229   rpm_libs="$rpm_libs $r"
     
    230235 done
    231236
    232  for r in $rpm_bases $rpm_libs $rpm_tools
     237 for r in $rpm_common $rpm_libs $rpm_tools
    233238 do
    234239  echo "rpm $rpm_database --force" \
     
    334339
    335340   if [ $canadian_cross = yes ]; then
     341    ccl=${h}_cc_name
    336342    echo "rpmbuild --define '_build i686-redhat-linux' --define '_host $th' $rpm_database $rpmbuild_cmd"
    337343    $rpmbuild --define "_build i686-redhat-linux" \
    338344              --define "_host $th" \
     345              --define "__cc $processor-${!ccl}-$h-gcc" \
    339346              $rpm_database $rpmbuild_cmd
    340347    check "building host cross target: $rpm_prefix$t-rtems$version-$s"
Note: See TracChangeset for help on using the changeset viewer.