40
40
tar xzf $HIDAPI_VER.tar.gz && rm $HIDAPI_VER.tar.gz
41
41
pushd hidapi-$HIDAPI_VER
42
42
./bootstrap
43
- ./configure --prefix=$PWD/dist --host=${CONF_HOST} --enable-shared=no --enable-static=yes --disable-testgui CC=${HOST_CC}
43
+ ./configure --prefix=$PWD/dist --host=${CONF_HOST} --enable-shared=no --enable-static=yes --disable-testgui CC=${HOST_CC} CFLAGS=-std=gnu99
44
44
make
45
45
MAKEFLAGS= make install
46
46
popd
146
146
147
147
build_linux :
148
148
stage : build_openocd
149
- image : $CI_DOCKER_REGISTRY/openocd-ci-env:1
149
+ image : $CI_DOCKER_REGISTRY/esp32-toolchain
150
150
tags :
151
151
- build
152
152
artifacts :
@@ -155,14 +155,19 @@ build_linux:
155
155
expire_in : 2 weeks
156
156
variables :
157
157
PLATFORM_NAME : " linux-amd64"
158
+ CONF_HOST : " x86_64-linux-gnu"
159
+ HOST_CC : ${CONF_HOST}-gcc
158
160
needs :
159
161
- job : style_check
160
162
script :
161
163
- *get_release_name
162
164
- !reference [.add_gitlab_key, script]
163
165
- !reference [.submodules_mirror_update, script]
164
- - apt-get update
165
- - apt-get install libhidapi-dev -y
166
+ - apt-get update || true
167
+ - apt-get install systemd libudev-dev --force-yes -y # needed for hidapi build
168
+ - *buildx_hidapi
169
+ - *buildx_libjaylink
170
+ - export PKG_CONFIG_PATH=$PWD/hidapi-$HIDAPI_VER/dist/lib/pkgconfig/:$PWD/$LIBJAYLINK_VER/dist/lib/pkgconfig
166
171
- ./bootstrap
167
172
- mkdir _build
168
173
- pushd _build/
@@ -174,7 +179,7 @@ build_linux:
174
179
- *dist_archive
175
180
176
181
# Just to test build with latest gcc.
177
- . build_linux_gcc_latest :
182
+ build_linux_gcc_latest :
178
183
stage : build_openocd
179
184
image : $CI_DOCKER_REGISTRY/openocd-ci-env:1
180
185
tags :
@@ -187,7 +192,7 @@ build_linux:
187
192
- !reference [.submodules_mirror_update, script]
188
193
- ./bootstrap
189
194
- ./configure ${OPENOCD_CONFIGURE_OPTS}
190
- - make -j8
195
+ - make -j`nproc`
191
196
192
197
build_linux_armhf_test :
193
198
extends : .build_linux_arm_template
0 commit comments