Skip to content

Commit 101640f

Browse files
committed
Fix wrong install directory for APK packages
1 parent 3be5267 commit 101640f

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

pkg/apk/APKBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ build() {
4444
set +e
4545
cmake -B build -DINTEGRATE_VCPKG=ON -DCMAKE_BUILD_TYPE=Release \
4646
-DCMAKE_MAKE_PROGRAM=make \
47-
-DCMAKE_INSTALL_PREFIX="$pkgdir" \
47+
-DCMAKE_INSTALL_PREFIX="/usr" \
4848
-DBUILD_TESTS=OFF -DBUILD_DYNAMIC_LIB=ON -DBUILD_STATIC_LIB=ON \
4949
$ROOT_DIR
5050
if [[ $? -ne 0 ]]; then

pkg/apk/build-apk.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,12 @@ sudo abuild-keygen -a -i -n
4040
abuild -F -c -r
4141

4242
cp -r /root/packages/pkg ./build
43+
44+
# Test installation
45+
apk add --allow-untrusted build/$PLATFORM/*.apk
46+
47+
cd $ROOT_DIR/win-examples
48+
g++ -o dynamic.out -std=c++11 ./example.cc -Wl,-rpath=/usr/lib -lpulsar
49+
./dynamic.out
50+
g++ -o static.out -std=c++11 ./example.cc /usr/lib/libpulsarwithdeps.a -lpthread -ldl
51+
./static.out

0 commit comments

Comments
 (0)