From 5883ec53d09393e4ecc2112b3985fc4167cf18bd Mon Sep 17 00:00:00 2001 From: Simon Wright Date: Fri, 20 May 2022 10:28:12 +0100 Subject: [PATCH 1/3] Correct msys2 externals for libblas, liblapack (#521) * index/li/libblas/libblas-external.toml: uncomment the msys2 origin and make it to lapack. The reason is that we require libblas.dll, and this isn't provided by openblas (lapack provides both). Also, add an empty origin for macos. * index/li/liblapack/liblapack-external.toml: uncomment the msys2 origin. Also, add an empty origin for macos. --- index/li/libblas/libblas-external.toml | 3 ++- index/li/liblapack/liblapack-external.toml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/index/li/libblas/libblas-external.toml b/index/li/libblas/libblas-external.toml index 1c731185..b6df2142 100644 --- a/index/li/libblas/libblas-external.toml +++ b/index/li/libblas/libblas-external.toml @@ -9,5 +9,6 @@ maintainers-logins = ["simonjwright"] [[external]] kind="system" [external.origin."case(distribution)"] +"macos" = [] "debian|ubuntu" = ["libblas-dev"] -# "msys2" = ["mingw-w64-x86_64-openblas"] +"msys2" = ["mingw-w64-x86_64-lapack"] diff --git a/index/li/liblapack/liblapack-external.toml b/index/li/liblapack/liblapack-external.toml index 411f0b70..4db4cee1 100644 --- a/index/li/liblapack/liblapack-external.toml +++ b/index/li/liblapack/liblapack-external.toml @@ -9,5 +9,6 @@ maintainers-logins = ["simonjwright"] [[external]] kind="system" [external.origin."case(distribution)"] +"macos" = [] "debian|ubuntu" = ["liblapack-dev"] -# "msys2" = ["mingw-w64-x86_64-lapack"] +"msys2" = ["mingw-w64-x86_64-lapack"] From 4a6fddc7c1b99167641c0fce9f96c497123795bb Mon Sep 17 00:00:00 2001 From: Alejandro R Mosteo Date: Tue, 24 May 2022 20:41:45 +0200 Subject: [PATCH 2/3] Fix action used to set up alr (#525) --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index db3d836c..4efdb082 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: - name: Set up stable `alr` if: contains(github.base_ref, 'stable-') - uses: alire-project/setup-alire@latest-stable + uses: alire-project/setup-alire@v1 - name: Set up GNAT for devel `alr` if: contains(github.base_ref, 'devel-') @@ -22,7 +22,9 @@ jobs: - name: Set up devel `alr` if: contains(github.base_ref, 'devel-') - uses: alire-project/setup-alire@latest-devel + uses: alire-project/setup-alire@v1 + with: + branch: master - run: alr index --list From 0b1fc4ed4dd9ec985ec929f99d3d3d7efe40adff Mon Sep 17 00:00:00 2001 From: Holger Rodriguez <52081159+hgrodriguez@users.noreply.github.com> Date: Mon, 30 May 2022 20:50:51 +0200 Subject: [PATCH 3/3] eeprom_i2c 3.2.0 (#526) removed runtime/target dependency in GPR file --- index/ee/eeprom_i2c/eeprom_i2c-3.2.0.toml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 index/ee/eeprom_i2c/eeprom_i2c-3.2.0.toml diff --git a/index/ee/eeprom_i2c/eeprom_i2c-3.2.0.toml b/index/ee/eeprom_i2c/eeprom_i2c-3.2.0.toml new file mode 100644 index 00000000..8624a292 --- /dev/null +++ b/index/ee/eeprom_i2c/eeprom_i2c-3.2.0.toml @@ -0,0 +1,18 @@ +name = "eeprom_i2c" +description = "EEPROM I2C drivers library for embedded platforms" +version = "3.2.0" +licenses = "BSD-3-Clause" + +authors = ["Holger Rodriguez"] +maintainers = ["Holger Rodriguez "] +maintainers-logins = ["hgrodriguez"] +tags = ["embedded", "nostd", "eeprom", "rp2040", "i2c"] +website = "https://github.com/hgrodriguez/eeprom_i2c" + +[[depends-on]] # Added by alr +hal = "~0.1.0" # Added by alr + +[origin] +commit = "c6d81ebc6b10a9d163d4735841cb694c4cd175e2" +url = "git+https://github.com/hgrodriguez/eeprom_i2c.git" +