Skip to content

Commit 1918351

Browse files
committed
Fix(build): Use standard CMake pipelines and clean up dev package
- Switched to Melange standard CMake pipelines (configure, build, install) for consistency. - Set BUILD_TESTING=OFF as want_check was causing issues. - Removed manual handling of aws-c-http dev folder, as it is now managed upstream (see: awslabs/aws-c-http#497). Signed-off-by: Debasish Biswas <debasishbsws.dev@gmail.com>
1 parent f944ba1 commit 1918351

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

aws-c-http.yaml

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

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

45-
- runs: |
46-
DESTDIR="${{targets.destdir}}" cmake --install build
41+
- uses: cmake/install
4742

4843
- uses: strip
4944

5045
subpackages:
5146
- name: aws-c-http-dev
5247
pipeline:
5348
- uses: split/dev
54-
- runs: |
55-
mkdir -p "${{targets.subpkgdir}}"/usr/lib
56-
mv "${{targets.destdir}}"/usr/lib/aws-c-http "${{targets.subpkgdir}}"/usr/lib/
5749
dependencies:
5850
runtime:
5951
- aws-c-http

0 commit comments

Comments
 (0)