Merge branch 'avrdudes:main' into 8.1.0---isp

This commit is contained in:
MX682X
2024-11-23 22:58:58 +01:00
committed by GitHub
2 changed files with 32 additions and 10 deletions

View File

@@ -63,6 +63,7 @@ jobs:
mkdir _ambuild && cd _ambuild
../src/configure
--enable-option-checking=fatal
--enable-doc
--enable-parport
--enable-linuxgpio
@@ -218,10 +219,12 @@ jobs:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- name: Original PATH and build tools
run: |
echo "PATH=$PATH"
for b in bison flex pkg-config; do type "$b"; done
- name: Install prerequisites
run: >-
# brew update
brew install
cmake
flex
@@ -233,12 +236,18 @@ jobs:
libftdi
readline
libserialport
pkg-config
- name: Configure environment to use brew kegs for flex and bison
run: |
echo "PATH=/opt/homebrew/opt/flex/bin:/opt/homebrew/opt/bison/bin:$PATH" >> $GITHUB_ENV
- name: post-brew PATH and build tools
run: |
echo "PATH=$PATH"
for b in bison flex pkg-config; do type "$b"; done
- name: Configure
run: >-
cmake
-D CMAKE_C_FLAGS=-I/opt/homebrew/include
-D CMAKE_EXE_LINKER_FLAGS=-L/opt/homebrew/Cellar
-D CMAKE_C_FLAGS="-I/opt/homebrew/include -I/opt/homebrew/opt/flex/include"
-D CMAKE_EXE_LINKER_FLAGS="-L/opt/homebrew/Cellar -L/opt/homebew/opt/flex/lib"
-D DEBUG_CMAKE=1
-D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-B build
@@ -269,10 +278,12 @@ jobs:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- name: Original PATH and build tools
run: |
echo "PATH=$PATH"
for b in bison flex pkg-config; do type "$b"; done
- name: Install prerequisites
run: >-
# brew update
brew install
automake
autoconf
@@ -286,15 +297,24 @@ jobs:
libftdi
readline
libserialport
pkg-config
- name: Configure environment to use brew kegs for flex and bison
run: |
echo "PATH=/opt/homebrew/opt/flex/bin:/opt/homebrew/opt/bison/bin:$PATH" >> $GITHUB_ENV
- name: post-brew PATH and build tools
run: |
echo "PATH=$PATH"
for b in bison flex pkg-config; do type "$b"; done
- name: Configure
run: >-
./src/bootstrap
mkdir _ambuild && cd _ambuild
CFLAGS="-I/opt/homebrew/include" LDFLAGS="-L/opt/homebrew/lib" ../src/configure
CFLAGS="-I/opt/homebrew/include -I/opt/homebrew/opt/flex/include"
LDFLAGS="-L/opt/homebrew/lib -L/opt/homebrew/opt/bison/lib"
../src/configure
--enable-option-checking=fatal
- name: Build
run: make -C _ambuild -j$(nproc)
- name: "avrdude -? (not installed)"

2
NEWS
View File

@@ -23,6 +23,8 @@ Changes since version 8.0:
- Add AVR128DAxxS parts #1918
- Update usbpids in avrdude.conf #1919
- Add extra version information to avrdude output #1927
- CI: Ensure only supported configure options are used (--enable-option-checking=fatal) #1934
* Internals: