Skip to content

Commit

Permalink
Merge pull request #60 from fourdollars/dfsg
Browse files Browse the repository at this point in the history
Fix the linking issues for libia_cca*.so.0
  • Loading branch information
hao-yao authored Sep 1, 2023
2 parents 3ab6cfe + 44b1998 commit 376fccf
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 3 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/dfsg-ize.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:

jobs:
dfsg-checks:
strategy:
matrix:
strip: [strip, nostrip]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -23,6 +26,13 @@ jobs:
- name: "lint"
run: shellcheck ./scripts/dfsg-ize

- name: "Strip binaries"
if: ${{ matrix.strip == 'strip' }}
run: |
for lib in $(find . -type f -name lib\*.so.\*); do
strip "${lib}";
done
- name: "Install files"
run: |
cat README.md | \
Expand All @@ -41,6 +51,18 @@ jobs:
sed 's,ipu6-camera-bins/,./,' | \
sudo sh -x
- name: "Test linking with ld-linux.so"
run: |
ld_linux=$(which /lib/*/ld-linux*)
for lib in $(find . -type f -name lib\*.so.\*); do
echo "Verifying ${lib}"
rm -f ret; LD_DEBUG=all "${ld_linux}" --verify "${lib}" || echo $? >ret
if [ -e ret ]; then
echo "Return value: $(<ret)"
test "$(<ret)" != "1"
fi
done
- name: "Test linking with pkg-config"
run: |
echo "int main() {return 0;}" | tee test.c
Expand Down
Binary file modified lib/ipu_adl/libia_cca-ipu6ep.so.0
Binary file not shown.
Binary file modified lib/ipu_mtl/libia_cca-ipu6epmtl.so.0
Binary file not shown.
Binary file modified lib/ipu_tgl/libia_cca.so.0
Binary file not shown.
3 changes: 0 additions & 3 deletions scripts/dfsg-ize
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ for flavor in "${flavors[@]}"; do
libia_aiqb_parser)
patchelf --add-needed "libia_log${appendix}.so.${soversion}" "${file}";
;;
libia_cca)
patchelf --add-needed "libia_coordinate${appendix}.so.${soversion}" "${file}";
;;
esac;
$MV "${file}" "${libdir}/${soname}";
done;
Expand Down

0 comments on commit 376fccf

Please sign in to comment.