Skip to content

Commit 1cce106

Browse files
debasishbswsOddBloke
authored andcommitted
Fix(build): Use standard CMake pipelines and clean up dev package
- Refactored build process to use Melange standard CMake pipelines (configure, build, install) - Removed manual handling of aws-c-event-stream dev folder as it is now handled upstream (see: awslabs/aws-c-event-stream#119) Signed-off-by: Debasish Biswas <[email protected]>
1 parent 2d7de04 commit 1cce106

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

aws-c-event-stream.yaml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,33 +28,25 @@ pipeline:
2828
tag: v${{package.version}}
2929
expected-commit: 9422ef78aac566414d1bebb1a5431a4c53a7547c
3030

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

46-
- runs: |
47-
DESTDIR="${{targets.destdir}}" cmake --install build
42+
- uses: cmake/install
4843

4944
- uses: strip
5045

5146
subpackages:
5247
- name: aws-c-event-stream-dev
5348
pipeline:
5449
- uses: split/dev
55-
- runs: |
56-
mkdir -p "${{targets.subpkgdir}}"/usr/lib
57-
mv "${{targets.destdir}}"/usr/lib/aws-c-event-stream "${{targets.subpkgdir}}"/usr/lib/
5850
dependencies:
5951
runtime:
6052
- aws-c-event-stream

0 commit comments

Comments
 (0)