Skip to content

Commit d7a53c6

Browse files
authored
update libddwaf: 1.9.0 => 1.10.0 (#23)
* Update the libddwaf updater to not add the `.a` files anymore * Run it Signed-off-by: Eliott Bouhana <[email protected]>
1 parent 9c7896f commit d7a53c6

File tree

5 files changed

+6
-22
lines changed

5 files changed

+6
-22
lines changed

_tools/libddwaf-updater/update.sh

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ run_strip() {
5151
echo Updating libddwaf for darwin/arm64
5252
curl -L https://github.com/DataDog/libddwaf/releases/download/$version/libddwaf-$version-darwin-arm64.tar.gz | tar -xz -C$tmpdir
5353
echo Copying the darwin/arm64 library
54-
cp -v $tmpdir/libddwaf-$version-darwin-arm64/lib/libddwaf.a.stripped $bindings_dir/lib/darwin-arm64/libddwaf.a
5554
cp -v "$tmpdir/libddwaf-$version-darwin-arm64/lib/libddwaf.dylib" "$bindings_dir/lib/darwin-arm64/_libddwaf.dylib"
5655

5756
#
@@ -61,7 +60,6 @@ cp -v "$tmpdir/libddwaf-$version-darwin-arm64/lib/libddwaf.dylib" "$bindings_dir
6160
echo Updating libddwaf for darwin/amd64yes
6261
curl -L https://github.com/DataDog/libddwaf/releases/download/$version/libddwaf-$version-darwin-x86_64.tar.gz | tar -xz -C$tmpdir
6362
echo Copying the darwin/amd64 library
64-
cp -v $tmpdir/libddwaf-$version-darwin-x86_64/lib/libddwaf.a.stripped $bindings_dir/lib/darwin-amd64/libddwaf.a
6563
cp -v "$tmpdir/libddwaf-$version-darwin-x86_64/lib/libddwaf.dylib" "$bindings_dir/lib/darwin-amd64/_libddwaf.dylib"
6664

6765
#
@@ -75,16 +73,9 @@ curl -L https://github.com/DataDog/libddwaf/releases/download/$version/libddwaf-
7573
libcxx_dir=$tmpdir/libc++-x86_64-linux
7674
mkdir $libcxx_dir
7775
curl -L https://github.com/DataDog/libddwaf/releases/download/$version/libc++-static-x86_64-linux.tar.gz | tar -xz -C$libcxx_dir
78-
# 3. Combine libddwaf.a + libc++.a + libc++abi.a + libunwind.a in a single
79-
# object file by using ld -r
80-
run_binutils x86_64-linux-gnu-ld \
81-
-r -o $bindings_dir/lib/linux-amd64/libddwaf.a \
82-
$LD_REQUIRED_DEFINED \
83-
$tmpdir/libddwaf-$version-linux-x86_64/lib/libddwaf.a $libcxx_dir/libc++.a $libcxx_dir/libc++abi.a $libcxx_dir/libunwind.a
84-
# 4. Strip
85-
run_strip x86_64-linux-gnu $bindings_dir/lib/linux-amd64/libddwaf.a
86-
cp -v "$tmpdir/libddwaf-$version-linux-x86_64/lib/libddwaf.so" "$bindings_dir/lib/linux-amd64/_libddwaf.so"
87-
run_strip x86_64-linux-gnu "$bindings_dir/lib/linux-amd64/_libddwaf.so"
76+
# 4. Copy & Strip
77+
cp -v "$tmpdir/libddwaf-$version-linux-x86_64/lib/libddwaf.so" "$bindings_dir/lib/linux-amd64/libddwaf.so"
78+
run_strip x86_64-linux-gnu "$bindings_dir/lib/linux-amd64/libddwaf.so"
8879

8980
#
9081
# linux/arm64
@@ -97,16 +88,9 @@ curl -L https://github.com/DataDog/libddwaf/releases/download/$version/libddwaf-
9788
libcxx_dir=$tmpdir/libc++-aarch64-linux
9889
mkdir $libcxx_dir
9990
curl -L https://github.com/DataDog/libddwaf/releases/download/$version/libc++-static-aarch64-linux.tar.gz | tar -xz -C$libcxx_dir
100-
# 3. Combine libddwaf.a + libc++.a + libc++abi.a + libunwind.a in a single
101-
# object file by using ld -r
102-
run_binutils aarch64-linux-gnu-ld \
103-
-r -o $bindings_dir/lib/linux-arm64/libddwaf.a \
104-
$LD_REQUIRED_DEFINED \
105-
$tmpdir/libddwaf-$version-linux-aarch64/lib/libddwaf.a $libcxx_dir/libc++.a $libcxx_dir/libc++abi.a $libcxx_dir/libunwind.a
106-
# 4. Strip
107-
run_strip aarch64-linux-gnu $bindings_dir/lib/linux-arm64/libddwaf.a
108-
cp -v "$tmpdir/libddwaf-$version-linux-aarch64/lib/libddwaf.so" "$bindings_dir/lib/linux-arm64/_libddwaf.so"
109-
run_strip aarch64-linux-gnu "$bindings_dir/lib/linux-arm64/_libddwaf.so"
91+
# 4. Copy & Strip
92+
cp -v "$tmpdir/libddwaf-$version-linux-aarch64/lib/libddwaf.so" "$bindings_dir/lib/linux-arm64/libddwaf.so"
93+
run_strip aarch64-linux-gnu "$bindings_dir/lib/linux-arm64/libddwaf.so"
11094

11195
#
11296
# ddwaf.h

lib/darwin-amd64/_libddwaf.dylib

-8 Bytes
Binary file not shown.

lib/darwin-arm64/_libddwaf.dylib

0 Bytes
Binary file not shown.

lib/linux-amd64/libddwaf.so

-1.52 KB
Binary file not shown.

lib/linux-arm64/libddwaf.so

-1.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)