Package: r-cran-httpuv / 1.6.15+dfsg-1

use_debian_packages_libuv1.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
Author: Andreas Tille <tille@debian.org>
Last-Update: Mon, 06 May 2019 10:05:51 +0200
Description: Use Debian packaged libuv1 library

--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -1,6 +1,6 @@
 UNAME := $(shell uname)
 
-PKG_LIBS = @libs@ ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread
+PKG_LIBS = ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -luv -pthread
 
 ifeq ($(UNAME), Darwin)
 PKG_LIBS += -lz -framework CoreServices
@@ -38,12 +38,12 @@ CONFIGURE_FLAGS="--quiet"
 # PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS
 
 
-$(SHLIB): @deps@ 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.
-libuv/m4/lt~obsolete.m4: libuv/m4/lt_obsolete.m4
-	cp -p -f libuv/m4/lt_obsolete.m4 libuv/m4/lt~obsolete.m4
+##libuv/m4/lt~obsolete.m4: libuv/m4/lt_obsolete.m4
+##	cp -p -f libuv/m4/lt_obsolete.m4 libuv/m4/lt~obsolete.m4
 
 # Run ./configure to create the Makefile.
 #
@@ -65,23 +65,23 @@ libuv/m4/lt~obsolete.m4: libuv/m4/lt_obs
 # from one to the next, i.e. the order matters. To remove this fragility, we
 # use "-r aclocal.m4" to ensure that all three files are guaranteed to have
 # precisely the same timestamp value.
-libuv/Makefile: libuv/m4/lt~obsolete.m4
-	cd libuv; \
-	if ! command -v automake >/dev/null 2>&1 ; then \
-		echo "automake not found. Touching files so configure will not try to run automake."; \
-		touch aclocal.m4; \
-		touch -r aclocal.m4 configure Makefile.in; \
-	else \
-		echo "automake found. Running autoupdate and autogen.sh."; \
-		autoupdate; \
-		sh autogen.sh; \
-	fi; \
-	chmod +x configure; \
-	CC="$(CC)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY) -DNDEBUG" CPPFLAGS="$(CPPFLAGS)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFIGURE_FLAGS)
-
-libuv/.libs/libuv.a: libuv/Makefile
-	$(MAKE) --directory=libuv \
-		HAVE_DTRACE=0
-
-clean:
-	$(MAKE) --directory=libuv distclean
+##libuv/Makefile: libuv/m4/lt~obsolete.m4
+##	cd libuv; \
+##	if ! command -v automake >/dev/null 2>&1 ; then \
+##		echo "automake not found. Touching files so configure will not try to run automake."; \
+##		touch aclocal.m4; \
+##		touch -r aclocal.m4 configure Makefile.in; \
+##	else \
+##		echo "automake found. Running autoupdate and autogen.sh."; \
+##		autoupdate; \
+##		sh autogen.sh; \
+##	fi; \
+##	chmod +x configure; \
+##	CC="$(CC)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY) -DNDEBUG" CPPFLAGS="$(CPPFLAGS)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFIGURE_FLAGS)
+##
+##libuv/.libs/libuv.a: libuv/Makefile
+##	$(MAKE) --directory=libuv \
+##		HAVE_DTRACE=0
+##
+## clean:
+##	$(MAKE) --directory=libuv distclean