lsquic: improve patch (#4429)

packages/l/ls-hpack/xmake.lua

@@ -14,8 +14,6 @@ package("ls-hpack")
         io.writefile("xmake.lua", [[
             add_rules("mode.debug", "mode.release")
 
-            set_symbols("none")
-
             add_requires("xxhash")
             add_packages("xxhash")
 

packages/l/lsquic/patches/4.0.8/cmake.patch

@@ -0,0 +1,34 @@
+diff --git a/src/liblsquic/CMakeLists.txt b/src/liblsquic/CMakeLists.txt
+index fe6307e..9873e62 100644
+--- a/src/liblsquic/CMakeLists.txt
++++ b/src/liblsquic/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ # Copyright (c) 2017 - 2022 LiteSpeed Technologies Inc.  See LICENSE.
+ SET(lsquic_STAT_SRCS
+-    ls-qpack/lsqpack.c
+     lsquic_adaptive_cc.c
+     lsquic_alarmset.c
+     lsquic_arr.c
+@@ -102,7 +101,6 @@ ELSE()
+     INCLUDE_DIRECTORIES(../lshpack)
+     SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS}
+         lsquic_xxhash.c
+-        ../lshpack/lshpack.c
+     )
+ ENDIF()
+ 
+@@ -133,12 +131,13 @@ IF(LSQUIC_SHARED_LIB)
+ ELSE()
+   add_library(lsquic STATIC ${lsquic_STAT_SRCS})
+ ENDIF()
+-
++target_link_libraries(lsquic PRIVATE ls-hpack ls-qpack)
+ target_include_directories(
+     lsquic PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/lsquic>)
+ 
+ install(TARGETS lsquic
+     EXPORT lsquic-targets
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )

packages/l/lsquic/xmake.lua

@@ -8,6 +8,8 @@ package("lsquic")
 
     add_versions("v4.0.8", "f18ff2fa0addc1c51833304b3d3ff0979ecf5f53f54f96bcd3442a40cfcd440b")
 
+    add_patches(">=4.0.8", "patches/4.0.8/cmake.patch", "c9b8412fbd7df511dee4d57ea5dfa50bc527e015fc808270235b91abfd9baa89")
+
     add_configs("fiu", {description = "Use Fault Injection in Userspace (FIU)", default = false, type = "boolean"})
 
     add_deps("cmake")
@@ -29,9 +31,6 @@ package("lsquic")
             -- https://github.com/litespeedtech/lsquic/issues/433
             package:add("defines", "WIN32", "WIN32_LEAN_AND_MEAN")
         end
-
-        io.replace("src/liblsquic/CMakeLists.txt", "ls-qpack/lsqpack.c", "", {plain = true})
-        io.replace("src/liblsquic/CMakeLists.txt", "../lshpack/lshpack.c", "", {plain = true})
         io.replace("CMakeLists.txt", "-WX", "", {plain = true})
 
         local boringssl = package:dep("boringssl")
@@ -49,9 +48,10 @@ package("lsquic")
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
         table.insert(configs, "-DLSQUIC_SHARED_LIB=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DLSQUIC_FIU=" .. (package:config("fiu") and "ON" or "OFF"))
+        if package:is_plat("windows") then
+            table.insert(configs, "-DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=''")
+        end
         import("package.tools.cmake").install(package, configs, opt)
-
-        os.vcp(path.join(package:buildir(), "**.dll"), package:installdir("bin"))
     end)
 
     on_test(function (package)