ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/pcre2/pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch

   1 Index: CMakeLists.txt
   2 ===================================================================
   3 --- CMakeLists.txt      (revision 1255)
   4 +++ CMakeLists.txt      (working copy)
   5 @@ -475,6 +475,12 @@
   6                 ${PROJECT_BINARY_DIR}/pcre2.h
   7                 @ONLY)
   8
   9 +# Make sure to not link debug libs
  10 +# against release libs and vice versa
  11 +IF(WIN32)
  12 +  SET(CMAKE_DEBUG_POSTFIX "d")
  13 +ENDIF(WIN32)
  14 +
  15  # Generate pkg-config files
  16
  17  SET(PACKAGE_VERSION "${PCRE2_MAJOR}.${PCRE2_MINOR}")
  18 @@ -483,6 +489,9 @@
  19  SET(exec_prefix "\${prefix}")
  20  SET(libdir "\${exec_prefix}/lib")
  21  SET(includedir "\${prefix}/include")
  22 +IF(WIN32 AND (CMAKE_BUILD_TYPE MATCHES Debug))
  23 +  SET(LIB_POSTFIX ${CMAKE_DEBUG_POSTFIX})
  24 +ENDIF()
  25  CONFIGURE_FILE(libpcre2-posix.pc.in libpcre2-posix.pc @ONLY)
  26  SET(pkg_config_files ${pkg_config_files} "${CMAKE_CURRENT_BINARY_DIR}/libpcre2-posix.pc")
  27
  28 @@ -622,11 +631,6 @@
  29  ENDIF(MSVC)
  30
  31  SET(CMAKE_INCLUDE_CURRENT_DIR 1)
  32 -# needed to make sure to not link debug libs
  33 -# against release libs and vice versa
  34 -IF(WIN32)
  35 -  SET(CMAKE_DEBUG_POSTFIX "d")
  36 -ENDIF(WIN32)
  37
  38  SET(targets)
  39
  40 Index: configure.ac
  41 ===================================================================
  42 --- configure.ac        (revision 1255)
  43 +++ configure.ac        (working copy)
  44 @@ -1007,6 +1007,9 @@
  45  AM_CONDITIONAL([WITH_GCOV],[test "x$enable_coverage" = "xyes"])
  46
  47  # Produce these files, in addition to config.h.
  48 +# LIB_POSTFIX is used by CMakeLists.txt for Windows debug builds.
  49 +# Pass empty LIB_POSTFIX to *.pc files and pcre2-config here.
  50 +AC_SUBST(LIB_POSTFIX)
  51  AC_CONFIG_FILES(
  52         Makefile
  53         libpcre2-8.pc
  54 Index: libpcre2-16.pc.in
  55 ===================================================================
  56 --- libpcre2-16.pc.in   (revision 1255)
  57 +++ libpcre2-16.pc.in   (working copy)
  58 @@ -8,6 +8,6 @@
  59  Name: libpcre2-16
  60  Description: PCRE2 - Perl compatible regular expressions C library (2nd API) with 16 bit character support
  61  Version: @PACKAGE_VERSION@
  62 -Libs: -L${libdir} -lpcre2-16
  63 +Libs: -L${libdir} -lpcre2-16@LIB_POSTFIX@
  64  Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
  65  Cflags: -I${includedir} @PCRE2_STATIC_CFLAG@
  66 Index: libpcre2-32.pc.in
  67 ===================================================================
  68 --- libpcre2-32.pc.in   (revision 1255)
  69 +++ libpcre2-32.pc.in   (working copy)
  70 @@ -8,6 +8,6 @@
  71  Name: libpcre2-32
  72  Description: PCRE2 - Perl compatible regular expressions C library (2nd API) with 32 bit character support
  73  Version: @PACKAGE_VERSION@
  74 -Libs: -L${libdir} -lpcre2-32
  75 +Libs: -L${libdir} -lpcre2-32@LIB_POSTFIX@
  76  Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
  77  Cflags: -I${includedir} @PCRE2_STATIC_CFLAG@
  78 Index: libpcre2-8.pc.in
  79 ===================================================================
  80 --- libpcre2-8.pc.in    (revision 1255)
  81 +++ libpcre2-8.pc.in    (working copy)
  82 @@ -8,6 +8,6 @@
  83  Name: libpcre2-8
  84  Description: PCRE2 - Perl compatible regular expressions C library (2nd API) with 8 bit character support
  85  Version: @PACKAGE_VERSION@
  86 -Libs: -L${libdir} -lpcre2-8
  87 +Libs: -L${libdir} -lpcre2-8@LIB_POSTFIX@
  88  Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
  89  Cflags: -I${includedir} @PCRE2_STATIC_CFLAG@
  90 Index: libpcre2-posix.pc.in
  91 ===================================================================
  92 --- libpcre2-posix.pc.in        (revision 1255)
  93 +++ libpcre2-posix.pc.in        (working copy)
  94 @@ -8,6 +8,6 @@
  95  Name: libpcre2-posix
  96  Description: Posix compatible interface to libpcre2-8
  97  Version: @PACKAGE_VERSION@
  98 -Libs: -L${libdir} -lpcre2-posix
  99 +Libs: -L${libdir} -lpcre2-posix@LIB_POSTFIX@
 100  Cflags: -I${includedir} @PCRE2_STATIC_CFLAG@
 101  Requires.private: libpcre2-8
 102 Index: pcre2-config.in
 103 ===================================================================
 104 --- pcre2-config.in     (revision 1255)
 105 +++ pcre2-config.in     (working copy)
 106 @@ -86,7 +86,7 @@
 107        ;;
 108      --libs-posix)
 109        if test @enable_pcre2_8@ = yes ; then
 110 -        echo $libS$libR -lpcre2-posix -lpcre2-8
 111 +        echo $libS$libR -lpcre2-posix@LIB_POSTFIX@ -lpcre2-8@LIB_POSTFIX@
 112        else
 113          echo "${usage}" 1>&2
 114        fi
 115 @@ -93,7 +93,7 @@
 116        ;;
 117      --libs8)
 118        if test @enable_pcre2_8@ = yes ; then
 119 -        echo $libS$libR -lpcre2-8
 120 +        echo $libS$libR -lpcre2-8@LIB_POSTFIX@
 121        else
 122          echo "${usage}" 1>&2
 123        fi
 124 @@ -100,7 +100,7 @@
 125        ;;
 126      --libs16)
 127        if test @enable_pcre2_16@ = yes ; then
 128 -        echo $libS$libR -lpcre2-16
 129 +        echo $libS$libR -lpcre2-16@LIB_POSTFIX@
 130        else
 131          echo "${usage}" 1>&2
 132        fi
 133 @@ -107,7 +107,7 @@
 134        ;;
 135      --libs32)
 136        if test @enable_pcre2_32@ = yes ; then
 137 -        echo $libS$libR -lpcre2-32
 138 +        echo $libS$libR -lpcre2-32@LIB_POSTFIX@
 139        else
 140          echo "${usage}" 1>&2
 141        fi