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: 3d83cc28e50ce14b9586f9e6cb80d1ec134982af
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: b9005fe8b560e6b51778cc508c714ad3443da353
Choose a head ref
Showing with 17 additions and 13 deletions.
  1. +7 −2 .travis/common.sh
  2. +1 −1 conda-env.sh
  3. +1 −1 gcc/newlib/build.sh
  4. +1 −1 gcc/newlib/meta.yaml
  5. +1 −1 gcc/nostdc/meta.yaml
  6. +1 −1 nextpnr/build.sh
  7. +0 −3 nextpnr/meta.yaml
  8. +1 −0 yosys/build.sh
  9. +2 −0 yosys/conda_build_config.yaml
  10. +2 −3 yosys/meta.yaml
9 changes: 7 additions & 2 deletions .travis/common.sh
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ export -f travis_fold
export -f travis_time_start
export -f travis_time_finish
if [ -z "$DATE_STR" ]; then
export DATE_NUM="$(date -u +%y%m%d%H%M)"
export DATE_NUM="$(date -u +%Y%m%d%H%M%S)"
export DATE_STR="$(date -u +%Y%m%d_%H%M%S)"
echo "Setting date number to $DATE_NUM"
echo "Setting date string to $DATE_STR"
@@ -43,11 +43,16 @@ export PYTHONWARNINGS=ignore::UserWarning:conda_build.environ
export BASE_PATH="/tmp/really-really-really-really-really-really-really-really-really-really-really-really-really-long-path"
export CONDA_PATH="$BASE_PATH/conda"
mkdir -p "$BASE_PATH"
export PATH="$PATH:$CONDA_PATH/bin"
export PATH="$CONDA_PATH/bin:$PATH"

export GITREV="$(git describe --long 2>/dev/null || echo "unknown")"
export CONDA_BUILD_ARGS=$PACKAGE
if [ -f "$PACKAGE/conda_build_config.$TOOLCHAIN_ARCH.yaml" ]; then
export CONDA_BUILD_ARGS="$CONDA_BUILD_ARGS -m $PACKAGE/conda_build_config.$TOOLCHAIN_ARCH.yaml"
fi
export CONDA_OUT="$(conda render $CONDA_BUILD_ARGS --output 2> /dev/null | tail -n 1 | sed -e's/-[0-9]\+\.tar/*.tar/' -e's/-git//')"

echo " GITREV: $GITREV"
echo " CONDA_PATH: $CONDA_PATH"
echo "CONDA_BUILD_ARGS: $CONDA_BUILD_ARGS"
echo " CONDA_OUT: $CONDA_OUT"
2 changes: 1 addition & 1 deletion conda-env.sh
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ fi
export PYTHONWARNINGS=ignore::UserWarning:conda_build.environ

if [ -z "$DATE_STR" ]; then
export DATE_NUM="$(date -u +%y%m%d%H%M)"
export DATE_NUM="$(date -u +%Y%m%d%H%M%S)"
export DATE_STR="$(date -u +%Y%m%d_%H%M%S)"
echo "Setting date number to $DATE_NUM"
echo "Setting date string to $DATE_STR"
2 changes: 1 addition & 1 deletion gcc/newlib/build.sh
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ echo "---"
$TARGET-gcc --version 2>&1
echo "---"

GCC_STAGE1_VERSION=$($TARGET-gcc --version 2>&1 | head -1 | sed -e"s/$TARGET-gcc (GCC) //")
GCC_STAGE1_VERSION=$($TARGET-gcc --version 2>&1 | head -1 | sed -e"s/$TARGET-gcc (/).*/")
GCC_STAGE2_VERSION=$(echo $PKG_VERSION | sed -e's/-.*//')
if [ "$GCC_STAGE1_VERSION" != "$GCC_STAGE2_VERSION" ]; then
echo
2 changes: 1 addition & 1 deletion gcc/newlib/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: gcc-{{ environ.get('TOOLCHAIN_ARCH') }}-elf-newlib
{% if environ.get('TOOLCHAIN_ARCH') == "or1k" %}
version: 5.4.0+{{ gcc_git_rev }}
version: 5.4.0_{{ gcc_git_rev }}
{% else %}
version: 5.4.0
{% endif %}
2 changes: 1 addition & 1 deletion gcc/nostdc/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: gcc-{{ environ.get('TOOLCHAIN_ARCH') }}-elf-nostdc
{% if environ.get('TOOLCHAIN_ARCH') == "or1k" %}
version: 5.4.0+{{ gcc_git_rev }}
version: 5.4.0_{{ gcc_git_rev }}
{% else %}
version: 5.4.0
{% endif %}
2 changes: 1 addition & 1 deletion nextpnr/build.sh
Original file line number Diff line number Diff line change
@@ -7,6 +7,6 @@ if [ x"$TRAVIS" = xtrue ]; then
CPU_COUNT=2
fi

cmake -DARCH=ice40 -DBUILD_GUI=OFF -DICEBOX_ROOT=${PREFIX}/share/icebox -DCMAKE_INSTALL_PREFIX=/ .
cmake -DARCH=ice40 -DBUILD_GUI=OFF -DICEBOX_ROOT=${PREFIX}/share/icebox -DCMAKE_INSTALL_PREFIX=/ -DENABLE_READLINE=No .
make -j$(nproc)
make DESTDIR=${PREFIX} install
3 changes: 0 additions & 3 deletions nextpnr/meta.yaml
Original file line number Diff line number Diff line change
@@ -31,16 +31,13 @@ requirements:
- flex
- fontconfig
- icestorm
- ncurses
- pkg-config
- python {{ python }}
- readline
run:
- icestorm
- libboost
- py-boost
- python
- readline
- yosys

test:
1 change: 1 addition & 0 deletions yosys/build.sh
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ which pkg-config

make config-conda-linux
echo "PREFIX := $PREFIX" >> Makefile.conf
echo "ENABLE_READLINE := 0" >> Makefile.conf

make V=1 -j$CPU_COUNT
make test
2 changes: 2 additions & 0 deletions yosys/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
python:
- 3.6
5 changes: 2 additions & 3 deletions yosys/meta.yaml
Original file line number Diff line number Diff line change
@@ -27,14 +27,13 @@ requirements:
- {{ compiler('cxx') }}
host:
- pkg-config
- readline
- bison
- tk
- python {{ python }}
- tk 8.5.18
- libffi
- flex
- iverilog
run:
- readline
- tk
- libffi
- flex