Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: litex-hub/litex-conda-packages
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fa911c6c1be036d87f6f94ab3e989ab5f58be4a9
Choose a base ref
..
head repository: litex-hub/litex-conda-packages
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9f02aa5de2810223ca15ff824ab820634a9f3112
Choose a head ref
Showing with 74 additions and 74 deletions.
  1. +2 −1 .gitignore
  2. +11 −11 .travis.yml
  3. +1 −1 arachne-pnr/build.sh
  4. +8 −1 flterm/meta.yaml
  5. +1 −2 gcc/newlib/meta.yaml
  6. +0 −11 gcc/newlib/reload1.patch
  7. +0 −1 gcc/newlib/stdint.patch
  8. +26 −0 gcc/newlib/stdint.patch
  9. +1 −6 gcc/nostdc/meta.yaml
  10. +0 −11 gcc/nostdc/reload1.patch
  11. +0 −26 gcc/nostdc/stdint.patch
  12. +8 −1 openocd/meta.yaml
  13. +8 −1 sdcc/meta.yaml
  14. +8 −1 verilator/meta.yaml
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Miniconda3-latest-Linux-x86_64.sh
recipe_append.yaml
gcc/nostdc/conda_build_config.*.extra.yaml
gcc/nostdc/conda_build_config.*.yaml
gcc/newlib/conda_build_config.*.yaml
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
language: c

#cache:
# ccache: true
# directories:
# - /tmp/really-really-really-really-really-really-really-really-really-really-really-really-really-long-path/conda/conda-bld/git_cache
# - /tmp/really-really-really-really-really-really-really-really-really-really-really-really-really-long-path/conda/conda-bld/src_cache
#before_cache:
# - ./.travis/before_cache.sh
cache:
ccache: true
directories:
- /tmp/really-really-really-really-really-really-really-really-really-really-really-really-really-long-path/conda/conda-bld/git_cache
- /tmp/really-really-really-really-really-really-really-really-really-really-really-really-really-long-path/conda/conda-bld/src_cache
before_cache:
- ./.travis/before_cache.sh

#dist: trusty
sudo: false
@@ -50,16 +50,16 @@ env:
# sh2 toolchain
- PACKAGE=binutils TOOLCHAIN_ARCH=sh2
# fx2 toolchain
- PACKAGE=sdcc CONDA_BUILD_VERSION=2.1.17
- PACKAGE=sdcc
# tools
- PACKAGE=openocd CONDA_BUILD_VERSION=2.1.17
- PACKAGE=flterm CONDA_BUILD_VERSION=2.1.17
- PACKAGE=openocd
- PACKAGE=flterm
# verilog tools
- PACKAGE=arachne-pnr
- PACKAGE=icestorm
- PACKAGE=iverilog
- PACKAGE=nextpnr
- PACKAGE=verilator CONDA_BUILD_VERSION=2.1.17
- PACKAGE=verilator
- PACKAGE=vtr CONDA_CHANNELS=conda-forge
- PACKAGE=yosys

2 changes: 1 addition & 1 deletion arachne-pnr/build.sh
Original file line number Diff line number Diff line change
@@ -22,5 +22,5 @@ ls -l $ICEBOX
echo "--------------------------------------"

make V=1 -j$CPU_COUNT
make test
make simpletest
make install
9 changes: 8 additions & 1 deletion flterm/meta.yaml
Original file line number Diff line number Diff line change
@@ -6,7 +6,14 @@ source:
git_url: https://github.com/timvideos/flterm.git

build:
number: 0
# y==GIT_DESCRIBE_NUMBER, z==DATESTR, x==GIT_DESCRIBE_HASH
#
# number: 10693001803050325
# 1yyyy00zzzzzzzzzz
number: {{ '1%04i00%s'|format(environ.get('GIT_DESCRIBE_NUMBER')|int, environ.get('DATESTR')) }}
# string: 0693.1803050325.g588ce0e3
# yyyy.zzzzzzzzzz.gxxxxxxxx
string: {{ '%04i'|format(environ.get('GIT_DESCRIBE_NUMBER')|int) }}.{{ environ.get('DATESTR') }}.{{ environ.get('GIT_DESCRIBE_HASH', 'unknown') }}
script_env:
- CI
- TRAVIS
3 changes: 1 addition & 2 deletions gcc/newlib/meta.yaml
Original file line number Diff line number Diff line change
@@ -17,8 +17,7 @@ source:
sha256: 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a
folder: gcc
patches:
# - stdint.patch
# - reload1.patch
- stdint.patch
{% else %}
- url: empty.tar.bz2
folder: other
11 changes: 0 additions & 11 deletions gcc/newlib/reload1.patch

This file was deleted.

1 change: 0 additions & 1 deletion gcc/newlib/stdint.patch

This file was deleted.

26 changes: 26 additions & 0 deletions gcc/newlib/stdint.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From f151e2adc9c93b5d65f551f087077609821b71b7 Mon Sep 17 00:00:00 2001
From: nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 6 Oct 2015 16:36:49 +0000
Subject: [PATCH] * config.gcc (lm32-elf): Add newlib-stdint.h to
tm_file.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228533 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/config.gcc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/config.gcc b/gcc/config.gcc
index b3529a8..5818663 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1834,7 +1834,7 @@ iq2000*-*-elf*)
md_file=iq2000/iq2000.md
;;
lm32-*-elf*)
- tm_file="dbxelf.h elfos.h ${tm_file}"
+ tm_file="dbxelf.h elfos.h ${tm_file} newlib-stdint.h"
tmake_file="${tmake_file} lm32/t-lm32"
;;
lm32-*-rtems*)
--
2.9.3
7 changes: 1 addition & 6 deletions gcc/nostdc/meta.yaml
Original file line number Diff line number Diff line change
@@ -6,22 +6,17 @@ package:
version: 5.4.0
{% endif %}

{% if environ.get('TOOLCHAIN_ARCH') == "or1k" %}
source:
{% if environ.get('TOOLCHAIN_ARCH') == "or1k" %}
- git_url: https://github.com/openrisc/or1k-gcc.git
git_rev: or1k-5.4.0
folder: gcc
{% elif environ.get('TOOLCHAIN_ARCH') %}
source:
- url: ftp://ftp.gnu.org/gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2
fn: gcc-5.4.0.tar.bz2
sha256: 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a
folder: gcc
patches:
# - stdint.patch
# - reload1.patch
{% else %}
source:
- url: empty.tar.bz2
folder: other
{% endif %}
11 changes: 0 additions & 11 deletions gcc/nostdc/reload1.patch

This file was deleted.

26 changes: 0 additions & 26 deletions gcc/nostdc/stdint.patch

This file was deleted.

9 changes: 8 additions & 1 deletion openocd/meta.yaml
Original file line number Diff line number Diff line change
@@ -18,7 +18,14 @@ source:
- spartan7-idcodes.patch

build:
number: 0
# y==GIT_DESCRIBE_NUMBER, z==DATESTR, x==GIT_DESCRIBE_HASH
#
# number: 10693001803050325
# 1yyyy00zzzzzzzzzz
number: {{ '1%04i00%s'|format(environ.get('GIT_DESCRIBE_NUMBER')|int, environ.get('DATESTR')) }}
# string: 0693.1803050325.g588ce0e3
# yyyy.zzzzzzzzzz.gxxxxxxxx
string: {{ '%04i'|format(environ.get('GIT_DESCRIBE_NUMBER')|int) }}.{{ environ.get('DATESTR') }}.{{ environ.get('GIT_DESCRIBE_HASH', 'unknown') }}
script_env:
- CI
- TRAVIS
9 changes: 8 additions & 1 deletion sdcc/meta.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,14 @@ source:
sha256: e85dceb11e01ffefb545ec389da91265130c91953589392dddd2e5ec0b7ca374

build:
number: 0
# z==DATESTR
#
# number: 1803050325
# zzzzzzzzzz
number: {{ environ.get('DATESTR') }}
# string: 0693.1803050325.g588ce0e3
# yyyy.zzzzzzzzzz.gxxxxxxxx
string: {{ environ.get('DATESTR') }}
script_env:
- CI
- TRAVIS
9 changes: 8 additions & 1 deletion verilator/meta.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,14 @@ source:

build:
detect_binary_files_with_prefix: True
number: 1
# y==GIT_DESCRIBE_NUMBER, z==DATESTR, x==GIT_DESCRIBE_HASH
#
# number: 10693001803050325
# 1yyyy00zzzzzzzzzz
number: {{ '1%04i00%s'|format(environ.get('GIT_DESCRIBE_NUMBER')|int, environ.get('DATESTR')) }}
# string: 0693.1803050325.g588ce0e3
# yyyy.zzzzzzzzzz.gxxxxxxxx
string: {{ '%04i'|format(environ.get('GIT_DESCRIBE_NUMBER')|int) }}.{{ environ.get('DATESTR') }}.{{ environ.get('GIT_DESCRIBE_HASH', 'unknown') }}
script_env:
- CI
- TRAVIS