diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-09-27 17:41:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 17:41:18 -0700 |
| commit | 7a05bde0a6872709333cfdff71ff6eedb0f89963 (patch) | |
| tree | 2799b82c689845b4c7a89eafdb9e9063c1ecc21f /ports/brotli/pkgconfig.patch | |
| parent | d0511fbd55629a078b10243b23ab1a7301fb54cf (diff) | |
| download | vcpkg-7a05bde0a6872709333cfdff71ff6eedb0f89963.tar.gz vcpkg-7a05bde0a6872709333cfdff71ff6eedb0f89963.zip | |
[asmjit][botan][brotli] Update version (#13676)
Diffstat (limited to 'ports/brotli/pkgconfig.patch')
| -rw-r--r-- | ports/brotli/pkgconfig.patch | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ports/brotli/pkgconfig.patch b/ports/brotli/pkgconfig.patch index 8ceafe1b1..c11e0d493 100644 --- a/ports/brotli/pkgconfig.patch +++ b/ports/brotli/pkgconfig.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2c4b757f9..eed560c1d 100644 +index b1c654b..fcd9024 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -351,7 +351,7 @@ function(generate_pkg_config_path outvar path) +@@ -390,7 +390,7 @@ function(generate_pkg_config_path outvar path) set("${outvar}" "${${outvar}}" PARENT_SCOPE) endfunction(generate_pkg_config_path) @@ -11,17 +11,18 @@ index 2c4b757f9..eed560c1d 100644 file(READ ${INPUT_FILE} TEXT) set(PREFIX "${CMAKE_INSTALL_PREFIX}") -@@ -366,14 +366,21 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION) +@@ -404,15 +404,22 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION) + string(REGEX REPLACE "@includedir@" "${INCLUDEDIR}" TEXT ${TEXT}) string(REGEX REPLACE "@PACKAGE_VERSION@" "${VERSION}" TEXT ${TEXT}) - ++ + if(BUILD_SHARED_LIBS) + set(LIB_NAME "${SHARED_TARGET}") + else() + set(LIB_NAME "${STATIC_TARGET}") + endif() + string(REGEX REPLACE "@lib_name@" "${LIB_NAME}" TEXT ${TEXT}) -+ + file(WRITE ${OUTPUT_FILE} ${TEXT}) endfunction() @@ -34,40 +35,40 @@ index 2c4b757f9..eed560c1d 100644 -transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}") +transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}" brotlienc brotlienc-static) + if(NOT BROTLI_EMSCRIPTEN) if(NOT BROTLI_BUNDLED_MODE) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc" diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in -index 2a8cf7a35..464a21292 100644 +index 10ca969..7736344 100644 --- a/scripts/libbrotlicommon.pc.in +++ b/scripts/libbrotlicommon.pc.in @@ -7,5 +7,5 @@ Name: libbrotlicommon URL: https://github.com/google/brotli Description: Brotli common dictionary library Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lbrotlicommon +-Libs: -L${libdir} -R${libdir} -lbrotlicommon +Libs: -L${libdir} -l@lib_name@ Cflags: -I${includedir} diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in -index 6f8ef2e41..f87d3f65f 100644 +index e7c3124..a7dc8ce 100644 --- a/scripts/libbrotlidec.pc.in +++ b/scripts/libbrotlidec.pc.in @@ -7,6 +7,6 @@ Name: libbrotlidec URL: https://github.com/google/brotli Description: Brotli decoder library Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lbrotlidec +-Libs: -L${libdir} -R${libdir} -lbrotlidec +Libs: -L${libdir} -l@lib_name@ Requires.private: libbrotlicommon >= 1.0.2 Cflags: -I${includedir} diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in -index 2098afe2c..7b6371bcb 100644 +index 4dd0811..eb2712e 100644 --- a/scripts/libbrotlienc.pc.in +++ b/scripts/libbrotlienc.pc.in @@ -7,6 +7,6 @@ Name: libbrotlienc URL: https://github.com/google/brotli Description: Brotli encoder library Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lbrotlienc +-Libs: -L${libdir} -R${libdir} -lbrotlienc +Libs: -L${libdir} -l@lib_name@ Requires.private: libbrotlicommon >= 1.0.2 Cflags: -I${includedir} |