Skip to content

Commit 05dd982

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-auth dev folder, as it is now managed upstream (see: awslabs/aws-c-auth#258). Signed-off-by: Debasish Biswas <debasishbsws.dev@gmail.com>
1 parent d8526ee commit 05dd982

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

aws-c-auth.yaml

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

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

48-
- runs: |
49-
DESTDIR="${{targets.destdir}}" cmake --install build
44+
- uses: cmake/install
5045

5146
- uses: strip
5247

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

0 commit comments

Comments
 (0)