diff options
author | Matthias Männich <maennich@google.com> | 2023-11-14 18:48:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-14 18:48:37 +0000 |
commit | 0464c79a0bac1f9993df17d37eaa9cb53b6030f1 (patch) | |
tree | 246ef6cbe6d83256000420828f68211e7260b379 | |
parent | 45e038f4f71ae7f69a7c91a18bc05e07a8e7d162 (diff) | |
parent | 7ff5bdfa2a9dd87d4c693467cdd3bb94fef7c84a (diff) | |
download | elfutils-0464c79a0bac1f9993df17d37eaa9cb53b6030f1.tar.gz |
Merge changes from topic "elfutils-zstd" into main am: 7c7f2af329 am: 7ff5bdfa2a
Original change: https://android-review.googlesource.com/c/platform/external/elfutils/+/2826411
Change-Id: I893f78550c75117e66410693d7be33e5fd37af9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | config.h | 4 | ||||
-rwxr-xr-x | post_update.sh | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -46,6 +46,7 @@ cc_defaults { name: "elfutils_transitive_defaults", static_libs: [ "libz", + "libzstd", ], } @@ -169,7 +170,6 @@ cc_library_host_static { // Do not enabled compression support "libdwfl/bzip2.c", "libdwfl/lzma.c", - "libdwfl/zstd.c", // Those headers are incompatible with clang due to nested function // definitions. "libdwfl/dwfl_segment_report_module.c", @@ -189,10 +189,10 @@ #define USE_ZLIB 1 /* Support ZSTD (zst) decompression via -lzstd. */ -/* #undef USE_ZSTD */ +#define USE_ZSTD 1 /* zstd compression support */ -/* #undef USE_ZSTD_COMPRESS */ +#define USE_ZSTD_COMPRESS 1 /* Version number of package */ #define VERSION "0.189" diff --git a/post_update.sh b/post_update.sh index 7072c8f4..9079e374 100755 --- a/post_update.sh +++ b/post_update.sh @@ -11,7 +11,7 @@ if [ "$1" != "" ]; then cd $1 fi -autoreconf -i && ./configure --enable-maintainer-mode --disable-debuginfod --disable-libdebuginfod --without-lzma --without-bzlib --without-zstd +autoreconf -i && ./configure --enable-maintainer-mode --disable-debuginfod --disable-libdebuginfod --without-lzma --without-bzlib # if called from the external_updater, do not apply any patches as it will do # that for us |