From eaeab0f3f5ef81d08436144cc8be04b89fbb38e5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 22 Sep 2018 23:50:25 -0400 Subject: [PATCH 1/2] Use system libuv. Signed-off-by: Elliott Sales de Andrade --- inst/COPYRIGHTS | 79 ------------------------------------------------- src/Makevars | 24 ++------------- 2 files changed, 3 insertions(+), 100 deletions(-) diff --git a/inst/COPYRIGHTS b/inst/COPYRIGHTS index 912533e3..ed998717 100644 --- a/inst/COPYRIGHTS +++ b/inst/COPYRIGHTS @@ -4,85 +4,6 @@ version 3. Included below is license and copyright information for externally maintained libraries used by fs. All other code in fs is copyright RStudio, Inc. -libuv is licensed for use as follows: - -==== -Copyright (c) 2015-present libuv project contributors. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. -==== - -This license applies to parts of libuv originating from the -https://github.com/joyent/libuv repository: - -==== - -Copyright Joyent, Inc. and other Node contributors. All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. - -==== - -This license applies to all parts of libuv that are not externally -maintained libraries. - -The externally maintained libraries used by libuv are: - - - tree.h (from FreeBSD), copyright Niels Provos. Two clause BSD license. - - - inet_pton and inet_ntop implementations, contained in src/inet.c, are - copyright the Internet Systems Consortium, Inc., and licensed under the ISC - license. - - - stdint-msvc2008.h (from msinttypes), copyright Alexander Chemeris. Three - clause BSD license. - - - pthread-fixes.c, copyright Google Inc. and Sony Mobile Communications AB. - Three clause BSD license. - - - android-ifaddrs.h, android-ifaddrs.c, copyright Berkeley Software Design - Inc, Kenneth MacKay and Emergya (Cloud4all, FP7/2007-2013, grant agreement - n° 289016). Three clause BSD license. - -Additional copyrights in libuv which do not appear above: - -Copyright Fedor Indutny. All rights reserved. -Copyright (c) 2015 Saúl Ibarra Corretgé . -Copyright (c) 2013, Ben Noordhuis -Copyright StrongLoop, Inc. -Copyright (c) 2016, Kari Tristan Helgason - The files in src/bsd are from libbsd (https://cgit.freedesktop.org/libbsd) and use one of the following licenses: diff --git a/src/Makevars b/src/Makevars index a4c07030..6e08a28f 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,6 +1,6 @@ UNAME := $(shell uname) -PKG_LIBS = ./libuv/.libs/libuv.a -pthread +PKG_LIBS = $(shell pkgconf --libs libuv) SOURCES = $(wildcard *.cc unix/*.cc) OBJECTS = $(SOURCES:.cc=.o) RcppExports.o @@ -19,29 +19,11 @@ ifeq ($(UNAME), Linux) OBJECTS += bsd/setmode.o bsd/strmode.o bsd/reallocarray.o endif -PKG_CPPFLAGS = -I./libuv/include -I. -pthread +PKG_CPPFLAGS = $(shell pkgconf --cflags libuv) -I. all: $(SHLIB) -$(SHLIB): libuv/.libs/libuv.a - -libuv/m4/lt~obsolete.m4: libuv/m4/lt_obsolete.m4 - cp -p -f libuv/m4/lt_obsolete.m4 libuv/m4/lt~obsolete.m4 - -libuv/Makefile: libuv/m4/lt~obsolete.m4 - (cd libuv \ - && touch aclocal.m4 \ - && touch -r aclocal.m4 configure Makefile.in \ - && CC="$(CC)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure --quiet) - -libuv/.libs/libuv.a: libuv/Makefile - $(MAKE) --directory=libuv \ - HAVE_DTRACE=0 - -.PHONY: shlib-clean clean - -shlib-clean: clean +.PHONY: clean clean: - $(MAKE) --directory=libuv distclean rm -f $(OBJECTS) -- 2.20.1