Ignore:
Timestamp:
Jan 21, 2018, 12:10:09 AM (6 years ago)
Author:
coas-nagasima
Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

Location:
EcnlProtoTool/trunk/mruby-1.3.0
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • EcnlProtoTool/trunk/mruby-1.3.0/build_config.rb

    r321 r331  
    1717  # end
    1818  # conf.gem 'examples/mrbgems/c_and_ruby_extension_example'
    19   # conf.gem :github => 'masuidrive/mrbgems-example', :checksum_hash => '76518e8aecd131d047378448ac8055fa29d974a9'
    20   # conf.gem :git => 'git@github.com:masuidrive/mrbgems-example.git', :branch => 'master', :options => '-v'
     19  # conf.gem :core => 'mruby-eval'
     20  # conf.gem :mgem => 'mruby-io'
     21  # conf.gem :github => 'iij/mruby-io'
     22  # conf.gem :git => 'git@github.com:iij/mruby-io.git', :branch => 'master', :options => '-v'
    2123
    2224  # include the default GEMs
     
    147149  conf.archiver.command = "arm-none-eabi-ar"
    148150
    149   conf.cc.flags << %w(-MD -MP -mlittle-endian -mcpu=cortex-a9 -mthumb -mthumb-interwork -marm -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard -mno-unaligned-access -fno-strict-aliasing)
     151  conf.cc.flags << %w(-MD -MP -mlittle-endian -mcpu=cortex-a9 -mthumb -mthumb-interwork -marm -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard -mno-unaligned-access -fno-strict-aliasing -nostdinc)
     152  conf.cc.include_paths  << "../musl-1.1.18/include"
     153
     154  conf.linker.flags << %w(-nostdlib)
     155  conf.linker.library_paths << "../musl-1.1.18/lib"
     156  conf.linker.libraries << %w(c gcc)
    150157
    151158  #configuration for low memory environment
     
    160167  conf.gem "#{root}/mrbgems/mruby-string-ext"
    161168  conf.gem '../mrbgems/mruby-onig-regexp'  do |g|
    162     g.cc.include_paths  << "../onigmo-5.15.0/src"
     169    g.cc.include_paths  << "../onigmo-6.1.3/src"
    163170  end
    164171  conf.gem "#{root}/../mrbgems/mruby-blockly"
     172  conf.gem "#{root}/../mrbgems/mruby-digest" do |g|
     173    g.cc.include_paths << "#{g.dir}/../../openssl-1.1.0e/include"
     174  end
     175  conf.gem "#{root}/../mrbgems/mruby-dir"
     176  conf.gem "#{root}/../mrbgems/mruby-env"
     177  conf.gem "#{root}/../mrbgems/mruby-errno"
     178  conf.gem "#{root}/../mrbgems/mruby-iijson"
    165179  conf.gem "#{root}/../mrbgems/mruby-io"
    166   conf.gem "#{root}/../mrbgems/mruby-dir" do |g|
    167     g.cc.defines = %w(__NEWLIB__=2)
    168     g.cc.include_paths << "#{g.dir}/../../musl-1.1.12/include"
    169   end
     180  conf.gem "#{root}/../mrbgems/mruby-ipaddr"
     181  conf.gem "#{root}/../mrbgems/mruby-mock"
    170182  conf.gem "#{root}/../mrbgems/mruby-pack"
    171   conf.gem "#{root}/../mrbgems/mruby-socket" do |g|
    172     g.cc.include_paths << "#{g.dir}/../../musl-1.1.12/include"
     183  conf.gem "#{root}/../mrbgems/mruby-require"
     184  conf.gem "#{root}/../mrbgems/mruby-socket"
     185  conf.gem "#{root}/../mrbgems/mruby-tls-openssl" do |g|
     186    g.cc.include_paths << "#{g.dir}/../../openssl-1.1.0e/include"
    173187  end
    174188  conf.gem "#{root}/../mrbgems/mruby-arduino" do |g|
    175     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/api"
    176     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/hal"
    177     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/cmsis"
    178     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H"
    179     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc"
    180     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc/iodefines"
    181     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H"
    182     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/TARGET_MBED_MBRZA1H"
    183     g.cc.include_paths << "#{g.dir}/../../sample/gr_peach"
    184189    g.cc.include_paths << "#{g.dir}/../../prototool/src"
     190    g.cc.include_paths << "#{g.dir}/../../mbed_api/src"
    185191  end
    186192  conf.gem "#{root}/../mrbgems/mruby-ecnl"
Note: See TracChangeset for help on using the changeset viewer.