ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/libxslt/0001-Fix-makefile.patch

   1 diff --git "a/win32/Makefile.msvc" "b/win32/Makefile.msvc"
   2 index 2e4742bb..8bfe7d83 100644
   3 --- "a/win32/Makefile.msvc"
   4 +++ "b/win32/Makefile.msvc"
   5 @@ -59,7 +59,13 @@ CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
   6  LD = link.exe
   7  LDFLAGS = /nologo
   8  LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
   9 -LIBS =
  10 +# The libraries are needed for static builds (the makefile builds all tools and dlls)
  11 +LIBS = iconv.lib charset.lib ws2_32.lib
  12 +!if "$(DEBUG)" == "1"
  13 +LIBS = $(LIBS) zlibd.lib lzmad.lib
  14 +!else
  15 +LIBS = $(LIBS) zlib.lib lzma.lib
  16 +!endif
  17
  18  # The archiver and its options.
  19  AR = lib.exe
  20 @@ -71,8 +77,14 @@ CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
  21  LDFLAGS = $(LDFLAGS) /DEBUG
  22  !else
  23  CFLAGS = $(CFLAGS) /D "NDEBUG" /O2
  24 +LDFLAGS = $(LDFLAGS) /DEBUG /OPT:REF /OPT:ICF
  25  !endif
  26
  27 +# append CFLAGS etc. passed on command line
  28 +CPPFLAGS = $(CPPFLAGS) $(EXTRA_CPPFLAGS)
  29 +CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS)
  30 +LDFLAGS = $(LDFLAGS) $(EXTRA_LDFLAGS)
  31 +
  32  # Libxslt object files.
  33  XSLT_OBJS = $(XSLT_INTDIR)\attributes.obj\
  34         $(XSLT_INTDIR)\documents.obj\
  35 @@ -309,13 +321,7 @@ $(UTILS_INTDIR) :
  36  # An implicit rule for xsltproc and friends.
  37  APPLIBS = $(LIBS)
  38  !if "$(STATIC)" == "1"
  39 -APPLIBS = $(LIBS) libxml2_a.lib
  40 -!if "$(WITH_ICONV)" == "1"
  41 -APPLIBS = $(APPLIBS) iconv.lib
  42 -!endif
  43 -!if "$(WITH_ZLIB)" == "1"
  44 -APPLIBS = $(APPLIBS) zlib.lib
  45 -!endif
  46 +APPLIBS = $(LIBS) libxml2.lib
  47  {$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe:
  48         $(CC) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" /D "LIBEXSLT_STATIC" \
  49                 $(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $<