Skip to content

Commit 41a2547

Browse files
committed
Fix(build): Use standard CMake pipelines and clean up dev package
- Replaced custom build steps with Melange standard CMake pipelines (configure, build, install). - Set BUILD_TESTING=OFF as want_check was causing issues. - Removed manual handling of aws-c-mqtt dev folder, as it is now managed upstream (see: awslabs/aws-c-mqtt#379). Signed-off-by: Debasish Biswas <debasishbsws.dev@gmail.com>
1 parent b3488bc commit 41a2547

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

aws-c-mqtt.yaml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,25 @@ pipeline:
2929
repository: https://github.com/awslabs/aws-c-mqtt
3030
tag: v${{package.version}}
3131

32-
- runs: |
33-
if [ "$CBUILD" != "$CHOST" ]; then
34-
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
35-
fi
36-
CFLAGS="$CFLAGS -flto=auto" \
37-
CXXFLAGS="$CXXFLAGS -flto=auto" \
38-
cmake -B build -G Ninja \
39-
-DCMAKE_INSTALL_PREFIX=/usr \
40-
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
32+
- uses: cmake/configure
33+
with:
34+
opts: |
4135
-DBUILD_SHARED_LIBS=True \
4236
-DCMAKE_BUILD_TYPE=None \
43-
-DBUILD_TESTING="$(want_check && echo ON || echo OFF)" \
44-
$CMAKE_CROSSOPTS
45-
cmake --build build
37+
-DBUILD_TESTING=OFF \
38+
-DCMAKE_SYSTEM_NAME=Linux \
39+
-DCMAKE_HOST_SYSTEM_NAME=Linux
40+
41+
- uses: cmake/build
4642

47-
- runs: |
48-
DESTDIR="${{targets.destdir}}" cmake --install build
43+
- uses: cmake/install
4944

5045
- uses: strip
5146

5247
subpackages:
5348
- name: aws-c-mqtt-dev
5449
pipeline:
5550
- uses: split/dev
56-
- runs: |
57-
mkdir -p "${{targets.subpkgdir}}"/usr/lib
58-
mv "${{targets.destdir}}"/usr/lib/aws-c-mqtt "${{targets.subpkgdir}}"/usr/lib/
5951
dependencies:
6052
runtime:
6153
- aws-c-mqtt

0 commit comments

Comments
 (0)