be6d506306
# httpuv 1.6.9 * Fixed #354: The incorrect method was called to clear a `vector`. (#355) * The `src/Makevars` file no longer sets `CXX_STD=CXX11`, and the `DESCRIPTION` file no longer lists `SystemRequirements: C++11`, because newer R versions always support C++11. (#356, #357) # httpuv 1.6.8 * Fixed #351: A race condition could cause httpuv to crash when starting the background thread for I/O. (#352) # httpuv 1.6.7 * Fixed rstudio/shiny#3741: The `TZ` environment variable could get unset in some cases. (#346) * Closed #302: Fixed potential thread-safety issues with `timegm2` implementation. (#346) # httpuv 1.6.6 * Update docs for CRAN (#343) * Updated to libuv 1.43.0. (#328) * Fixed #336: `encodeURI()` and `encodeURIComponent()` printed a space instead of a leading zero, as in `"% A"` instead of `"%0A"`. (#337)
33 lines
1.3 KiB
Text
33 lines
1.3 KiB
Text
$NetBSD: patch-src_Makevars,v 1.5 2023/03/12 07:20:54 mef Exp $
|
|
|
|
date: 2019-12-18 21:44:39 +0900; author: joerg; state: Exp; commitid: UcBUFje0SklPFbPB;
|
|
Use external libuv.
|
|
|
|
--- src/Makevars.orig 2023-02-09 04:27:58.000000000 +0900
|
|
+++ src/Makevars 2023-03-12 16:12:54.495701401 +0900
|
|
@@ -1,6 +1,6 @@
|
|
UNAME := $(shell uname)
|
|
|
|
-PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread
|
|
+PKG_LIBS = -luv ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread
|
|
|
|
ifeq ($(UNAME), Darwin)
|
|
PKG_LIBS += -framework CoreServices
|
|
@@ -18,7 +18,7 @@ endif
|
|
|
|
PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS
|
|
PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS
|
|
-PKG_CPPFLAGS = -Ilibuv/include -pthread
|
|
+PKG_CPPFLAGS = -I${PREFIX}/include -pthread
|
|
|
|
# To avoid spurious warnings from `R CMD check --as-cran`, about compiler
|
|
# warning flags like -Werror.
|
|
@@ -38,7 +38,7 @@ CONFIGURE_FLAGS="--quiet"
|
|
# PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS
|
|
|
|
|
|
-$(SHLIB): libuv/.libs/libuv.a http-parser/http_parser.o sha1/sha1.o base64/base64.o
|
|
+$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o
|
|
|
|
# We needed to rename lt~obsolete.m4 because the name causes problems with R
|
|
# CMD check. Here we rename it back.
|