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
|
diff -ruN librsvg-2.45.5/Makefile.am librsvg-2.45.5-fixed/Makefile.am
--- librsvg-2.45.5/Makefile.am 2019-02-16 01:01:25.000000000 +0800
+++ librsvg-2.45.5-fixed/Makefile.am 2019-03-02 20:17:17.432974000 +0800
@@ -139,6 +139,7 @@
cargo_verbose_1 = --verbose
RUST_LIB=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
+RUST_LIB_WIN=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/rsvg_internals.lib
CARGO_TARGET_DIR=@abs_top_builddir@/target
check-local:
@@ -167,7 +168,7 @@
PKG_CONFIG_ALLOW_CROSS=1 \
PKG_CONFIG='$(PKG_CONFIG)' \
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
- $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --features "c-library"
+ $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --features "c-library" && cp $(RUST_LIB_WIN) $(RUST_LIB)
librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
-I$(top_srcdir) \
@@ -193,7 +194,6 @@
$(AM_LDFLAGS)
librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
- $(RUST_LIB) \
$(LIBRSVG_LIBS) \
$(LIBM) \
$(DLOPEN_LIBS)
diff -ruN librsvg-2.45.5/Makefile.in librsvg-2.45.5-fixed/Makefile.in
--- librsvg-2.45.5/Makefile.in 2019-02-16 07:42:52.000000000 +0800
+++ librsvg-2.45.5-fixed/Makefile.in 2019-03-02 20:17:17.432974000 +0800
@@ -227,7 +227,7 @@
}
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES = $(RUST_LIB) \
+librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES = \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am__dirstamp = $(am__leading_dot)dirstamp
@@ -739,6 +739,7 @@
cargo_verbose_0 =
cargo_verbose_1 = --verbose
RUST_LIB = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
+RUST_LIB_WIN = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/rsvg_internals.lib
CARGO_TARGET_DIR = @abs_top_builddir@/target
librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
-I$(top_srcdir) \
@@ -764,7 +765,6 @@
$(AM_LDFLAGS)
librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
- $(RUST_LIB) \
$(LIBRSVG_LIBS) \
$(LIBM) \
$(DLOPEN_LIBS)
@@ -1103,8 +1103,8 @@
librsvg/@RSVG_API_MAJOR_VERSION@_la-rsvg-pixbuf.lo: \
librsvg/$(am__dirstamp) librsvg/$(DEPDIR)/$(am__dirstamp)
-librsvg-@RSVG_API_MAJOR_VERSION@.la: $(librsvg_@RSVG_API_MAJOR_VERSION@_la_OBJECTS) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES) $(EXTRA_librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES)
- $(AM_V_CCLD)$(librsvg_@RSVG_API_MAJOR_VERSION@_la_LINK) -rpath $(libdir) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_OBJECTS) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD) $(LIBS)
+librsvg-@RSVG_API_MAJOR_VERSION@.la: $(librsvg_@RSVG_API_MAJOR_VERSION@_la_OBJECTS) $(RUST_LIB) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES) $(EXTRA_librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(librsvg_@RSVG_API_MAJOR_VERSION@_la_LINK) -rpath $(libdir) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_OBJECTS) $(RUST_LIB) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD) $(LIBS)
rsvg-convert$(EXEEXT): $(rsvg_convert_OBJECTS) $(rsvg_convert_DEPENDENCIES) $(EXTRA_rsvg_convert_DEPENDENCIES)
@rm -f rsvg-convert$(EXEEXT)
@@ -1893,7 +1893,7 @@
PKG_CONFIG_ALLOW_CROSS=1 \
PKG_CONFIG='$(PKG_CONFIG)' \
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
- $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --features "c-library"
+ $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --features "c-library" && cp $(RUST_LIB_WIN) $(RUST_LIB)
@HAVE_INTROSPECTION_TRUE@-include $(INTROSPECTION_MAKEFILE)
|