pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

librsvg: attempt at getting the build further



Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Tue Nov 27 18:38:40 2018 +0200
Changeset:	eee7cebc68b3764dd4b2482ecd69fb992743ba87

Modified Files:
	librsvg/distinfo
	librsvg/patches/patch-Makefile.am
Added Files:
	librsvg/patches/patch-rsvg__internals_Cargo.toml

Log Message:
librsvg: attempt at getting the build further

- maybe link the rust internal library as dylib, and then link it

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=eee7cebc68b3764dd4b2482ecd69fb992743ba87

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 librsvg/distinfo                                 |  4 ++--
 librsvg/patches/patch-Makefile.am                |  9 +++++++++
 librsvg/patches/patch-rsvg__internals_Cargo.toml | 13 +++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diffs:
diff --git a/librsvg/distinfo b/librsvg/distinfo
index edd6c76ac7..60e21bfc4f 100644
--- a/librsvg/distinfo
+++ b/librsvg/distinfo
@@ -560,6 +560,6 @@ SHA1 (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = eadfdb146024d37b6887b5b9cb6a69
 RMD160 (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 300417853d251d91cadb9650992a6aa98248619f
 SHA512 (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 Size (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 bytes
-SHA1 (patch-Makefile.am) = 57ce484ee5eb67ed5ef0b09aaa09822f8fe251e4
-SHA1 (patch-configure) = 916e89aadb2f8f7f175b7a1e08813c00df6ea11a
+SHA1 (patch-Makefile.am) = 845cc2511af91f691be1293e4ef890ede8fe0be8
 SHA1 (patch-configure.ac) = bdad8c486f552dbd301abb49cef3f73aaeb81165
+SHA1 (patch-rsvg__internals_Cargo.toml) = e75641a5278b0420cf336f7d4b2a88186f7bb896
diff --git a/librsvg/patches/patch-Makefile.am b/librsvg/patches/patch-Makefile.am
index ff461bc29f..cb07a58ac2 100644
--- a/librsvg/patches/patch-Makefile.am
+++ b/librsvg/patches/patch-Makefile.am
@@ -11,6 +11,15 @@ $NetBSD$
  endif
  
  if CROSS_COMPILING
+@@ -142,7 +142,7 @@ cargo_verbose_ = $(cargo_verbose_$(AM_DE
+ cargo_verbose_0 =
+ cargo_verbose_1 = --verbose
+ 
+-RUST_LIB=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
++RUST_LIB=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.so
+ CARGO_TARGET_DIR=@abs_top_builddir@/target
+ 
+ check-local:
 @@ -160,12 +160,6 @@ distcheck-hook:
  		exit 1;								\
  	fi
diff --git a/librsvg/patches/patch-rsvg__internals_Cargo.toml b/librsvg/patches/patch-rsvg__internals_Cargo.toml
new file mode 100644
index 0000000000..0d19c0ebc8
--- /dev/null
+++ b/librsvg/patches/patch-rsvg__internals_Cargo.toml
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- rsvg_internals/Cargo.toml.orig	2018-10-09 13:52:22.000000000 +0000
++++ rsvg_internals/Cargo.toml
+@@ -73,7 +73,7 @@ criterion = "0.2"
+ 
+ [lib]
+ name = "rsvg_internals"
+-crate-type = ["staticlib", "lib"]
++crate-type = ["staticlib", "lib", "dylib"]
+ 
+ [[bench]]
+ name = "box_blur"


Home | Main Index | Thread Index | Old Index