Commit | Line | Data |
---|---|---|
d6983b13 LDB |
1 | Removes references to bundled libuv. |
2 | ||
3 | --- a/src/Makevars 2020-07-31 11:53:30.576484531 +0200 | |
4 | +++ b/src/Makevars 2020-07-31 11:54:19.369863118 +0200 | |
5 | @@ -5,7 +5,7 @@ | |
6 | ||
7 | UNAME := $(shell uname) | |
8 | ||
9 | -PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread | |
10 | +PKG_LIBS = -luv ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread | |
11 | ||
12 | ifeq ($(UNAME), Darwin) | |
13 | PKG_LIBS += -framework CoreServices | |
14 | @@ -23,7 +23,7 @@ | |
15 | ||
16 | PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS | |
17 | PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS | |
18 | -PKG_CPPFLAGS = -Ilibuv/include -pthread | |
19 | +PKG_CPPFLAGS = -pthread | |
20 | ||
21 | # To avoid spurious warnings from `R CMD check --as-cran`, about compiler | |
22 | # warning flags like -Werror. | |
23 | @@ -43,35 +43,5 @@ | |
24 | # PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS | |
25 | ||
26 | ||
27 | -$(SHLIB): libuv/.libs/libuv.a http-parser/http_parser.o sha1/sha1.o base64/base64.o | |
28 | +$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o | |
29 | ||
30 | -# We needed to rename lt~obsolete.m4 because the name causes problems with R | |
31 | -# CMD check. Here we rename it back. | |
32 | -libuv/m4/lt~obsolete.m4: libuv/m4/lt_obsolete.m4 | |
33 | - cp -p -f libuv/m4/lt_obsolete.m4 libuv/m4/lt~obsolete.m4 | |
34 | - | |
35 | -# Run ./configure. We need to touch various autotools-related files to avoid | |
36 | -# it trying to run autotools programs again. We also need to make sure | |
37 | -# configure is executable, because on some platforms, calling unzip() in R | |
38 | -# does not preserve the executable bit. | |
39 | -# | |
40 | -# It's VERY IMPORTANT that mtime(aclocal.m4) <= mtime(configure), and also | |
41 | -# mtime(aclocal.m4) <= mtime(Makefile.in). On some platforms, passing multiple | |
42 | -# files to a single touch command gives them all the same time, but on others | |
43 | -# (Solaris and possibly some Fedoras) the timestamps are slightly increasing | |
44 | -# from one to the next, i.e. the order matters. To remove this fragility, we | |
45 | -# use "-r aclocal.m4" to ensure that all three files are guaranteed to have | |
46 | -# precisely the same timestamp value. | |
47 | -libuv/Makefile: libuv/m4/lt~obsolete.m4 | |
48 | - (cd libuv \ | |
49 | - && touch aclocal.m4 \ | |
50 | - && touch -r aclocal.m4 configure Makefile.in \ | |
51 | - && chmod +x configure \ | |
52 | - && CC="$(CC)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFIGURE_FLAGS)) | |
53 | - | |
54 | -libuv/.libs/libuv.a: libuv/Makefile | |
55 | - $(MAKE) --directory=libuv \ | |
56 | - HAVE_DTRACE=0 | |
57 | - | |
58 | -clean: | |
59 | - $(MAKE) --directory=libuv distclean |