diff options
author | joerg <joerg@pkgsrc.org> | 2019-12-18 12:44:39 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2019-12-18 12:44:39 +0000 |
commit | 858296024c4d11a938b12392ff317ca61ef6241d (patch) | |
tree | 9666b9d201cfd719c2d6f44caaf6b08ec3592471 | |
parent | de3695b39ee4f62a8fab7682cbfa5bf022c2e58b (diff) | |
download | pkgsrc-858296024c4d11a938b12392ff317ca61ef6241d.tar.gz |
Use external libuv.
-rw-r--r-- | www/R-httpuv/Makefile | 4 | ||||
-rw-r--r-- | www/R-httpuv/distinfo | 3 | ||||
-rw-r--r-- | www/R-httpuv/patches/patch-src_Makevars | 31 |
3 files changed, 36 insertions, 2 deletions
diff --git a/www/R-httpuv/Makefile b/www/R-httpuv/Makefile index 32104000d08..65d429995c6 100644 --- a/www/R-httpuv/Makefile +++ b/www/R-httpuv/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2019/09/26 22:18:09 brook Exp $ +# $NetBSD: Makefile,v 1.4 2019/12/18 12:44:39 joerg Exp $ R_PKGNAME= httpuv R_PKGVER= 1.5.1 +PKGREVISION= 1 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org @@ -18,5 +19,6 @@ USE_LANGUAGES= c c++ .include "../../math/R/Makefile.extension" .include "../../devel/R-Rcpp/buildlink3.mk" .include "../../devel/boost-headers/buildlink3.mk" +.include "../../devel/libuv/buildlink3.mk" .include "../../sysutils/R-later/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/R-httpuv/distinfo b/www/R-httpuv/distinfo index 1671a49054c..9f7c3533711 100644 --- a/www/R-httpuv/distinfo +++ b/www/R-httpuv/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1 2019/08/09 20:26:46 brook Exp $ +$NetBSD: distinfo,v 1.2 2019/12/18 12:44:39 joerg Exp $ SHA1 (R/httpuv_1.5.1.tar.gz) = 5dd42f39bfda919ad890eea978089d27b2bc72da RMD160 (R/httpuv_1.5.1.tar.gz) = 24558208c04722e5844ccbe87fdcefc8db9aaa29 SHA512 (R/httpuv_1.5.1.tar.gz) = 17d1d9a922c17ebd738a59d3671e3d29f097937ef60774898f71dcfa0468d73d8c3b32915b6990941c9b7b03929fbdd6405932fa69672b004a0d129d3cded8c0 Size (R/httpuv_1.5.1.tar.gz) = 1758514 bytes +SHA1 (patch-src_Makevars) = d4fa4eea362aca5647b859cfaefa0fda6bd55c4e diff --git a/www/R-httpuv/patches/patch-src_Makevars b/www/R-httpuv/patches/patch-src_Makevars new file mode 100644 index 00000000000..60f1d66226d --- /dev/null +++ b/www/R-httpuv/patches/patch-src_Makevars @@ -0,0 +1,31 @@ +$NetBSD: patch-src_Makevars,v 1.1 2019/12/18 12:44:39 joerg Exp $ + +--- src/Makevars.orig 2019-04-05 20:06:25.000000000 +0000 ++++ src/Makevars +@@ -9,7 +9,7 @@ ifeq ($(UNAME), Darwin) + FRAMEWORK = -framework CoreServices + endif + +-PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o $(FRAMEWORK) -pthread ++PKG_LIBS = -luv ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o $(FRAMEWORK) -pthread + ifeq ($(UNAME), SunOS) + PKG_LIBS += -lkstat -lsendfile -lsocket -lxnet + endif +@@ -22,7 +22,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} -pthread + + # To avoid spurious warnings from `R CMD check --as-cran`, about compiler + # warning flags like -Werror. +@@ -44,7 +44,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. |