-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathR-4.4.2.patch
231 lines (197 loc) · 8.26 KB
/
R-4.4.2.patch
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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
diff --git a/configure b/configure
index ca7bd8d..19fdd3e 100755
--- a/configure
+++ b/configure
@@ -49650,7 +49650,7 @@ then :
printf %s "(cached) " >&6
else case e in #(
e) r_save_LIBS="${LIBS}"
-LIBS="${LIBS} -licuuc -licui18n"
+LIBS="${LIBS} -licui18n -licuuc -licudata -lpthread -lm /usr/lib/libstdc++.a"
if test "$cross_compiling" = yes
then :
r_cv_icu=no
@@ -49702,7 +49702,7 @@ if test "x${r_cv_icu}" = xyes; then
printf "%s\n" "#define USE_ICU 1" >>confdefs.h
- LIBS="${LIBS} -licuuc -licui18n"
+ LIBS="${LIBS} -licui18n -licuuc -licudata -lpthread -lm /usr/lib/libstdc++.a"
else
use_ICU=no
fi
diff --git a/share/make/shlib.mk b/share/make/shlib.mk
index c242704..ae8ab09 100644
--- a/share/make/shlib.mk
+++ b/share/make/shlib.mk
@@ -10,6 +10,10 @@ $(SHLIB): $(OBJECTS)
@if test "z$(OBJECTS)" != "z"; then \
echo $(SHLIB_LINK) -o $@ $(OBJECTS) $(ALL_LIBS); \
$(SHLIB_LINK) -o $@ $(OBJECTS) $(ALL_LIBS); \
+ if [ "`arch`" = "x86_64" ]; then \
+ echo $(R_HOME)/bin/patchelf --remove-needed libc.musl-x86_64.so.1 $@; \
+ $(R_HOME)/bin/patchelf --remove-needed libc.musl-x86_64.so.1 $@; \
+ fi; \
fi
.PHONY: all shlib-clean compilers
diff --git a/src/library/grDevices/src/Makefile.in b/src/library/grDevices/src/Makefile.in
index 61ebd74..8e4a0f9 100644
--- a/src/library/grDevices/src/Makefile.in
+++ b/src/library/grDevices/src/Makefile.in
@@ -29,6 +29,7 @@ PKG_CPPFLAGS =-I../../../include -I$(top_srcdir)/src/include -DHAVE_CONFIG_H
@BUILD_AQUA_TRUE@AQUA_LIBS = -framework AppKit
PKG_LIBS = $(AQUA_LIBS) -lz
+PKG_LIBS += -static-libgcc /usr/lib/libc.a -static
all: Makedeps
@$(MAKE) shlib @BUILD_DEVCAIRO_TRUE@ cairodevice
diff --git a/src/library/grDevices/src/cairo/Makefile.in b/src/library/grDevices/src/cairo/Makefile.in
index bac6766..a406b93 100644
--- a/src/library/grDevices/src/cairo/Makefile.in
+++ b/src/library/grDevices/src/cairo/Makefile.in
@@ -49,7 +49,7 @@ $(top_builddir)/src/modules/X11/rbitmap.o:
(cd $(top_builddir)/src/modules/X11; $(MAKE) rbitmap.o)
$(cairo_la): $(OBJECTS)
- $(SHLIB_LINK) -o $@ $(OBJECTS) $(cairo_la_LIBADD)
+ $(SHLIB_LINK) -o $@ $(OBJECTS) $(cairo_la_LIBADD) -static-libgcc /usr/lib/libc.a
mostlyclean: clean
clean:
diff --git a/src/library/graphics/src/Makefile.in b/src/library/graphics/src/Makefile.in
index ba450b9..39171e3 100644
--- a/src/library/graphics/src/Makefile.in
+++ b/src/library/graphics/src/Makefile.in
@@ -19,6 +19,7 @@ DEPENDS = $(SOURCES_C:.c=.d)
OBJECTS = $(SOURCES_C:.c=.o)
PKG_CFLAGS = $(C_VISIBILITY)
+PKG_LIBS += -static-libgcc /usr/lib/libc.a -static
SHLIB = $(pkg)@SHLIB_EXT@
diff --git a/src/library/grid/src/Makefile.in b/src/library/grid/src/Makefile.in
index 3f57c8d..697d7d8 100644
--- a/src/library/grid/src/Makefile.in
+++ b/src/library/grid/src/Makefile.in
@@ -20,7 +20,8 @@ SOURCES_F =
DEPENDS = $(SOURCES_C:.c=.d)
OBJECTS = $(SOURCES_C:.c=.o) $(SOURCES_F:.f=.o)
-PKG_CFLAGS=$(C_VISIBILITY)
+PKG_CFLAGS = $(C_VISIBILITY)
+PKG_LIBS += -static-libgcc /usr/lib/libc.a -static
SHLIB = $(pkg)@SHLIB_EXT@
diff --git a/src/library/methods/src/Makefile.in b/src/library/methods/src/Makefile.in
index a6d3c70..f4a3a4d 100644
--- a/src/library/methods/src/Makefile.in
+++ b/src/library/methods/src/Makefile.in
@@ -22,6 +22,7 @@ OBJECTS = $(SOURCES_C:.c=.o) $(SOURCES_F:.f=.o)
# need config.h
PKG_CPPFLAGS =-I../../../include -I$(top_srcdir)/src/include -DHAVE_CONFIG_H
PKG_CFLAGS=$(C_VISIBILITY)
+PKG_LIBS += -static-libgcc /usr/lib/libc.a -static
SHLIB = $(pkg)@SHLIB_EXT@
diff --git a/src/library/parallel/src/Makefile.in b/src/library/parallel/src/Makefile.in
index 53361c9..b2746d2 100644
--- a/src/library/parallel/src/Makefile.in
+++ b/src/library/parallel/src/Makefile.in
@@ -21,6 +21,7 @@ OBJECTS = $(SOURCES_C:.c=.o)
# need config.h
PKG_CPPFLAGS = -I../../../include -I$(top_srcdir)/src/include -DHAVE_CONFIG_H
PKG_CFLAGS = $(C_VISIBILITY)
+PKG_LIBS += -static-libgcc /usr/lib/libc.a -static
SHLIB = $(pkg)@SHLIB_EXT@
diff --git a/src/library/splines/src/Makefile.in b/src/library/splines/src/Makefile.in
index 3afafb7..1780a95 100644
--- a/src/library/splines/src/Makefile.in
+++ b/src/library/splines/src/Makefile.in
@@ -19,6 +19,7 @@ DEPENDS = $(SOURCES_C:.c=.d)
OBJECTS = $(SOURCES_C:.c=.o) $(SOURCES_F:.f=.o)
PKG_CFLAGS = $(C_VISIBILITY)
+PKG_LIBS += -static-libgcc /usr/lib/libc.a -static
SHLIB = $(pkg)@SHLIB_EXT@
diff --git a/src/library/stats/src/Makefile.in b/src/library/stats/src/Makefile.in
index 3046196..ec9b9b9 100644
--- a/src/library/stats/src/Makefile.in
+++ b/src/library/stats/src/Makefile.in
@@ -46,7 +46,7 @@ SHLIB = $(pkg)@SHLIB_EXT@
## override our setting.
PKG_LIBS = @R_OPENMP_CFLAGS@ $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
## </FIXME>
-
+PKG_LIBS += -static-libgcc /usr/lib/libc.a -static
all: Makedeps
@$(MAKE) shlib
diff --git a/src/library/tools/src/Makefile.in b/src/library/tools/src/Makefile.in
index 85767e6..eec7ef3 100644
--- a/src/library/tools/src/Makefile.in
+++ b/src/library/tools/src/Makefile.in
@@ -22,6 +22,7 @@ OBJECTS = $(SOURCES_C:.c=.o)
PKG_CPPFLAGS = -I../../../include -I$(top_srcdir)/src/include \
-DHAVE_CONFIG_H -I$(top_srcdir)/src/main
PKG_CFLAGS = $(C_VISIBILITY)
+PKG_LIBS += -static-libgcc /usr/lib/libc.a -static
SHLIB = $(pkg)@SHLIB_EXT@
diff --git a/src/library/utils/src/Makefile.in b/src/library/utils/src/Makefile.in
index 6e9a785..a23ee85 100644
--- a/src/library/utils/src/Makefile.in
+++ b/src/library/utils/src/Makefile.in
@@ -19,6 +19,7 @@ DEPENDS = $(SOURCES_C:.c=.d)
OBJECTS = $(SOURCES_C:.c=.o)
PKG_CFLAGS = $(C_VISIBILITY)
+PKG_LIBS += -static-libgcc /usr/lib/libc.a -static
SHLIB = $(pkg)@SHLIB_EXT@
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index a4180e8..7386853 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -37,7 +37,7 @@ SOURCES_C = \
times.c \
unique.c util.c \
version.c \
- g_alab_her.c g_cntrlify.c g_fontdb.c g_her_glyph.c
+ g_alab_her.c g_cntrlify.c g_fontdb.c g_her_glyph.c Lapack.c
SOURCES_F = xxxpr.f
@@ -147,7 +147,7 @@ R: Makedeps
(cd $(@D); $(MAKE) $(@F))
$(R_binary): $(R_bin_OBJECTS) $(R_bin_DEPENDENCIES)
- $(MAIN_LINK) -o $@ $(R_bin_OBJECTS) $(R_bin_LDADD)
+ $(MAIN_LINK) -o $@ $(R_bin_OBJECTS) $(R_bin_LDADD) -lreadline -static-libgcc
libR.a: $(OBJECTS) $(STATIC_LIBS)
-@mkdir libs
diff --git a/src/modules/internet/Makefile.in b/src/modules/internet/Makefile.in
index 1614632..bad022c 100644
--- a/src/modules/internet/Makefile.in
+++ b/src/modules/internet/Makefile.in
@@ -42,7 +42,7 @@ R: Makedeps
@$(MAKE) $(internet_la)
$(internet_la): $(OBJECTS)
- $(SHLIB_LINK) -o $@ $(OBJECTS) $(internet_la_LIBADD)
+ $(SHLIB_LINK) -o $@ $(OBJECTS) $(internet_la_LIBADD) -static-libgcc /usr/lib/libc.a
## <FIXME>
## Not sure if we want to do this ...
@$(MAKE) rhome="$(abs_top_builddir)" install
diff --git a/src/modules/lapack/Makefile.in b/src/modules/lapack/Makefile.in
index 0a1c9cb..3e83de7 100644
--- a/src/modules/lapack/Makefile.in
+++ b/src/modules/lapack/Makefile.in
@@ -49,7 +49,7 @@ lapack_la = lapack$(SHLIB_EXT)
lapack_la_OBJECTS = $(OBJECTS)
## Formerly used for passing '+s' to SHLIB_LINK on HP-UX.
lapack_la_LDFLAGS = @LAPACK_LDFLAGS@
-EXTRA_LIBS = @LAPACK_LIBS@ @BLAS_LIBS@ $(FLIBS_IN_SO)
+EXTRA_LIBS = @LAPACK_LIBS@ @BLAS_LIBS@
lapack_la_LIBADD = $(LIBR1) @DYLIB_UNDEFINED_ALLOWED_FALSE@ $(LIBINTL)
@@ -100,7 +100,7 @@ R: Makedeps
@$(MAKE) $(lapack_la)
$(lapack_la): $(lapack_la_OBJECTS)
- $(SHLIB_LINK) -o $@ $(lapack_la_LDFLAGS) $(lapack_la_OBJECTS) $(lapack_la_LIBADD) $(EXTRA_LIBS)
+ $(SHLIB_LINK) -o $@ $(lapack_la_LDFLAGS) $(lapack_la_OBJECTS) $(lapack_la_LIBADD) $(EXTRA_LIBS) -static-libgcc /usr/lib/libc.a -static
## <FIXME>
## Not sure if we want to do this ...
@$(MAKE) rhome="$(abs_top_builddir)" install
diff --git a/src/unix/Makefile.in b/src/unix/Makefile.in
index 4a35278..ff568a8 100644
--- a/src/unix/Makefile.in
+++ b/src/unix/Makefile.in
@@ -76,7 +76,7 @@ maintainer-clean: distclean
## we need to build at install time to capture the correct 'rhome'
install-Rscript:
$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS0) $(LDFLAGS) -DR_HOME='"$(rhome)"' \
- -o Rscript $(srcdir)/Rscript.c
+ -o Rscript $(srcdir)/Rscript.c -static-libgcc /usr/lib/libc.a
@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexecbindir)"
@$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(Rexecbindir)/Rscript"
## substitute at install time to allow 'prefix' to be overridden