diff --git a/ports/elfutils/link-libs.diff b/ports/elfutils/link-libs.diff index b50661d3f9..e74f88a696 100644 --- a/ports/elfutils/link-libs.diff +++ b/ports/elfutils/link-libs.diff @@ -10,10 +10,10 @@ index 2e83a43..bdfc808 100644 -Libs.private: @BZ2_LIB@ +Requires.private: zlib @LIBLZMA@ @LIBZSTD@ bzip2 diff --git a/configure.ac b/configure.ac -index 7bb1b0e..09b8d06 100644 +index f191488..fe617ac 100644 --- a/configure.ac +++ b/configure.ac -@@ -426,6 +426,8 @@ AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) +@@ -429,6 +429,8 @@ AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) dnl zlib is mandatory. save_LIBS="$LIBS" LIBS= @@ -22,7 +22,7 @@ index 7bb1b0e..09b8d06 100644 eu_ZIPLIB(zlib,ZLIB,z,gzdirect,gzip) AS_IF([test "x$with_zlib" = xno], [AC_MSG_ERROR([zlib not found but is required])]) LIBS="$save_LIBS" -@@ -434,13 +436,16 @@ dnl Test for bzlib and xz/lzma/zstd, gives BZLIB/LZMALIB/ZSTD .am +@@ -437,18 +439,21 @@ dnl Test for bzlib and xz/lzma/zstd, gives BZLIB/LZMALIB/ZSTD .am dnl conditional and config.h USE_BZLIB/USE_LZMALIB/USE_ZSTD #define. save_LIBS="$LIBS" LIBS= @@ -31,9 +31,14 @@ index 7bb1b0e..09b8d06 100644 # We need this since bzip2 doesn't have a pkgconfig file. BZ2_LIB="$LIBS" AC_SUBST([BZ2_LIB]) + save_LIBS="$LIBS" + LIBS= +PKG_CHECK_MODULES([LZMA], [liblzma], [LIBS="$LZMA_LIBS $LIBS"], AC_MSG_ERROR([liblzma not found])) eu_ZIPLIB(lzma,LZMA,lzma,lzma_auto_decoder,[LZMA (xz)]) + lzma_LIBS="$LIBS" + LIBS="$lzma_LIBS $save_LIBS" AS_IF([test "x$with_lzma" = xyes], [LIBLZMA="liblzma"], [LIBLZMA=""]) + AC_SUBST([lzma_LIBS]) AC_SUBST([LIBLZMA]) +PKG_CHECK_MODULES([ZSTD], [libzstd], [LIBS="$ZSTDLIBS $LIBS"], AC_MSG_ERROR([libzstd not found])) eu_ZIPLIB(zstd,ZSTD,zstd,ZSTD_decompress,[ZSTD (zst)]) @@ -81,10 +86,10 @@ index 3402863..30a331e 100644 libelf_so_LDLIBS += -lpthread endif diff --git a/src/Makefile.am b/src/Makefile.am -index 69620db..33f7f4b 100644 +index 6bdf2df..2fd5b42 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -41,8 +41,8 @@ CLEANFILES += make-debug-archive +@@ -47,8 +47,8 @@ CLEANFILES += make-debug-archive if BUILD_STATIC libasm = ../libasm/libasm.a @@ -93,5 +98,5 @@ index 69620db..33f7f4b 100644 +libdw = ../libdw/libdw.a $(ZLIB_LIBS) $(zip_LIBS) $(libelf) -ldl -lpthread +libelf = ../libelf/libelf.a $(ZLIB_LIBS) $(zstd_LIBS) if LIBDEBUGINFOD - libdebuginfod = ../debuginfod/libdebuginfod.a -lpthread $(libcurl_LIBS) + libdebuginfod = ../debuginfod/libdebuginfod.a -lpthread $(libcurl_LIBS) $(crypto_LIBS) $(jsonc_LIBS) else diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake index 0d8ff7ef81..9f4075743e 100644 --- a/ports/elfutils/portfile.cmake +++ b/ports/elfutils/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://sourceware.org/pub/elfutils/${VERSION}/elfutils-${VERSION}.tar.bz2" "https://www.mirrorservice.org/sites/sourceware.org/pub/elfutils/${VERSION}/elfutils-${VERSION}.tar.bz2" FILENAME "elfutils-${VERSION}.tar.bz2" - SHA512 e22d85f25317a79b36d370347e50284c9120c86f9830f08791b7b6a7b4ad89b9bf4c7c71129133b8d193a0edffb2a2c17987b7e48428b9670aff5ce918777e04 + SHA512 543188f5f2cfe5bc7955a878416c5f252edff9926754e5de0c6c57b132f21d9285c9b29e41281e93baad11d4ae7efbbf93580c114579c182103565fe99bd3909 ) vcpkg_extract_source_archive(SOURCE_PATH diff --git a/ports/elfutils/vcpkg.json b/ports/elfutils/vcpkg.json index a44bd2c2ba..85c8c9eaa7 100644 --- a/ports/elfutils/vcpkg.json +++ b/ports/elfutils/vcpkg.json @@ -1,6 +1,6 @@ { "name": "elfutils", - "version": "0.191", + "version": "0.192", "description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.", "homepage": "https://sourceware.org/elfutils/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 34f2081322..5e38d63e73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2553,7 +2553,7 @@ "port-version": 0 }, "elfutils": { - "baseline": "0.191", + "baseline": "0.192", "port-version": 0 }, "embree3": { diff --git a/versions/e-/elfutils.json b/versions/e-/elfutils.json index b51deeefad..f92a1176ab 100644 --- a/versions/e-/elfutils.json +++ b/versions/e-/elfutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "773241ff69478469d2ae1bca47abdd22eafae484", + "version": "0.192", + "port-version": 0 + }, { "git-tree": "68e8ad67d63cbd8f4d0588a361bd498a675595cd", "version": "0.191",