linuxmsm/cdba
0
0
Fork 0
mirror of https://github.com/linux-msm/cdba.git synced 2026-02-25 13:11:56 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28 from lumag/fix-ci

Browse Source 
Makefile: adapt for libftdi vs libftdi1 differences
This commit is contained in:
Konrad Dybcio
2023-09-21 15:42:57 +02:00
committed by GitHub
parent 38d05e8d95 b6ef0718d4
commit fb1118346d
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/ci.yml vendored
View File

@@ -51,24 +51,28 @@ jobs:
compiler: gcc -m32
cross_compile: i686-linux-gnu
variant: i386
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
- container: "debian:stable"
arch: i386
compiler: gcc -m32
cross_compile: i686-linux-gnu
variant: i386
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
- container: "debian:bookworm"
arch: i386
compiler: gcc -m32
cross_compile: i686-linux-gnu
variant: i386
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
- container: "debian:buster"
arch: i386
compiler: gcc -m32
cross_compile: i686-linux-gnu
variant: i386
pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
# Debian cross compilation builds
- container: "debian:testing"
@@ -76,48 +80,56 @@ jobs:
compiler: arm-linux-gnueabi-gcc
cross_compile: arm-linux-gnueabi
variant: cross-compile
pkg_config_path: /usr/lib/arm-linux-gnueabi/pkgconfig
- container: "debian:testing"
arch: arm64
compiler: aarch64-linux-gnu-gcc
cross_compile: aarch64-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/aarch64-linux-gnu/pkgconfig
- container: "debian:testing"
arch: ppc64el
compiler: powerpc64le-linux-gnu-gcc
cross_compile: powerpc64le-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/powerpc64le-linux-gnu/pkgconfig
- container: "debian:testing"
arch: s390x
compiler: s390x-linux-gnu-gcc
cross_compile: s390x-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/s390x-linux-gnu/pkgconfig
- container: "debian:stable"
arch: armel
compiler: arm-linux-gnueabi-gcc
cross_compile: arm-linux-gnueabi
variant: cross-compile
pkg_config_path: /usr/lib/arm-linux-gnueabi/pkgconfig
- container: "debian:stable"
arch: arm64
compiler: aarch64-linux-gnu-gcc
cross_compile: aarch64-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/aarch64-linux-gnu/pkgconfig
- container: "debian:stable"
arch: ppc64el
compiler: powerpc64le-linux-gnu-gcc
cross_compile: powerpc64le-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/powerpc64le-linux-gnu/pkgconfig
- container: "debian:stable"
arch: s390x
compiler: s390x-linux-gnu-gcc
cross_compile: s390x-linux-gnu
variant: cross-compile
pkg_config_path: /usr/lib/s390x-linux-gnu/pkgconfig
container:
image: ${{ matrix.container }}
@@ -127,6 +139,7 @@ jobs:
CROSS_COMPILE: ${{ matrix.cross_compile }}
MODE: ${{ matrix.mode }}
VARIANT: ${{ matrix.variant }}
PKG_CONFIG_PATH: ${{ matrix.pkg_config_path }}
steps:
- name: Show OS

5
Makefile
View File

@@ -26,7 +26,10 @@ else
$(info No compiler flags for: $(CC))
endif
LDFLAGS := -ludev -lyaml -lftdi -lusb
LIBFTDI := $(shell pkg-config --exists libftdi1 && echo libftdi1 || echo libftdi)
CPPFLAGS := $(shell pkg-config --cflags yaml-0.1 $(LIBFTDI) libudev)
LDFLAGS := $(shell pkg-config --libs yaml-0.1 $(LIBFTDI) libudev)
CLIENT_SRCS := cdba.c circ_buf.c
CLIENT_OBJS := $(CLIENT_SRCS:.c=.o)

1
ci/archlinux.sh
View File

@@ -21,6 +21,7 @@ pacman -Sy --noconfirm \
libyaml \
systemd-libs \
make \
pkgconf \
$PKGS_CC
echo "Install finished: $0"

1
ci/debian.sh
View File

@@ -28,6 +28,7 @@ case $CC in
esac
apt install -y --no-install-recommends \
pkg-config \
libftdi-dev \
libudev-dev \
libyaml-dev \