Skip to content

Commit

Permalink
FreeBSD 12 is EoL, relace with 14.0, upgrade cppcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
samm-git committed Jan 2, 2024
1 parent 6b8c925 commit 2c6870c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
27 changes: 14 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,6 @@ RUN cd /tmp && wget https://github.com/planetbeing/libdmg-hfsplus/archive/master
&& cmake ../ && make C_DEFINES= && make install \
&& cd / && rm -rf /tmp/libdmg-hfsplus-master /tmp/master.zip

# Get FreeBSD 12 libs/headers, extract and fix broken links
RUN cd /tmp && wget http://ftp.plusline.de/FreeBSD/releases/amd64/12.4-RELEASE/base.txz \
&& mkdir -p /opt/cross-freebsd-12 \
&& cd /opt/cross-freebsd-12 \
&& tar -xf /tmp/base.txz ./lib/ ./usr/lib/ ./usr/include/ \
&& cd /opt/cross-freebsd-12/usr/lib \
&& find . -xtype l|xargs ls -l|grep ' /lib/' \
| awk '{print "ln -sf /opt/cross-freebsd-12"$11 " " $9}' \
| /bin/sh \
&& ln -s libc++.a /opt/cross-freebsd-12/usr/lib/libstdc++.a \
&& ln -s libc++.so /opt/cross-freebsd-12/usr/lib/libstdc++.so \
&& rm -f /tmp/base.txz

# Get FreeBSD 13 libs/headers, extract and fix broken links
RUN cd /tmp && wget http://ftp.plusline.de/FreeBSD/releases/amd64/13.2-RELEASE/base.txz \
Expand All @@ -88,8 +76,21 @@ RUN cd /tmp && wget http://ftp.plusline.de/FreeBSD/releases/amd64/13.2-RELEASE/b
&& ln -s libc++.so /opt/cross-freebsd-13/usr/lib/libstdc++.so \
&& rm -f /tmp/base.txz

# Get FreeBSD 14 libs/headers, extract and fix broken links
RUN cd /tmp && wget http://ftp.plusline.de/FreeBSD/releases/amd64/14.0-RELEASE/base.txz \
&& mkdir -p /opt/cross-freebsd-14 \
&& cd /opt/cross-freebsd-14 \
&& tar -xf /tmp/base.txz ./lib/ ./usr/lib/ ./usr/include/ \
&& cd /opt/cross-freebsd-14/usr/lib \
&& find . -xtype l|xargs ls -l|grep ' /lib/' \
| awk '{print "ln -sf /opt/cross-freebsd-14"$11 " " $9}' \
| /bin/sh \
&& ln -s libc++.a /opt/cross-freebsd-14/usr/lib/libstdc++.a \
&& ln -s libc++.so /opt/cross-freebsd-14/usr/lib/libstdc++.so \
&& rm -f /tmp/base.txz

# Install cppcheck
RUN v=2.11 \
RUN v=2.13 \
&& cd /tmp \
&& wget -O cppcheck-$v.tar.gz https://github.com/danmar/cppcheck/archive/$v.tar.gz \
&& tar -xf cppcheck-$v.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Docker container based on Ubtuntu LTS, with all dependencies to generate smartmo
- Linux: x86_64, i686 using GCC
- Darwin x86_64, i386 using clang/[osxcross](https://github.com/tpoechtrager/osxcross)
- Windows: 64 and 32 bits
- FreeBSD 12.x, FreeBSD 13.x (clang crossbuild)
- FreeBSD 13.x, FreeBSD 14.x (clang crossbuild)

## Related links

Expand Down

0 comments on commit 2c6870c

Please sign in to comment.