From d7d6cf7511aec90769b1584ae66a6a9c0562f571 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 10 Nov 2014 17:25:43 -0500
Subject: [PATCH] more

---
 classes/rust.bbclass              | 18 ++++++++++++++++++
 recipes-deps/curl/curl_%.bbappend |  9 ++++++++-
 recipes-deps/libgit2/libgit2.inc  | 13 ++++++++++++-
 recipes-deps/zlib/zlib_%.bbappend |  4 ++--
 recipes/cargo/cargo.inc           | 13 ++++++++-----
 recipes/cargo/cargo_2014-11-10.bb | 10 ++++++++++
 6 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 recipes/cargo/cargo_2014-11-10.bb

diff --git a/classes/rust.bbclass b/classes/rust.bbclass
index eb94b57..4bd0408 100644
--- a/classes/rust.bbclass
+++ b/classes/rust.bbclass
@@ -37,6 +37,8 @@ RUST_PATH = "${RUST_PATH_NATIVE}"
 
 CARGO = "cargo"
 
+OECARGO_PATH ??= ""
+
 oe_runrustc () {
 	bbnote ${RUSTC} ${RUSTC_ARCHFLAGS} ${RUSTC_FLAGS} "$@"
 	"${RUSTC}" ${RUSTC_ARCHFLAGS} ${RUSTC_FLAGS} "$@"
@@ -51,9 +53,25 @@ oe_cargo_config () {
 	# assumed to be a path to a binary. If flags are needed, a wrapper must
 	# be used.
 	cat >.cargo/config <<EOF
+paths = [
+EOF
+
+	for p in ${OECARGO_PATH}; do
+		printf "\"%s\" " "$p" 
+	done | sed -e 's/[ \n]+/,/g'  -e 's/,$//' >>.cargo/config
+
+	cat >>.cargo/config <<EOF
+]
+
 [target.${RUST_TARGET_SYS}]
 ar = "${TARGET_PREFIX}ar"
 linker = "${TARGET_PREFIX}gcc"
+EOF
+
+
+	cat >>Cargo.toml <<EOF
+[profile.dev]
+rpath = true
 EOF
 }
 
diff --git a/recipes-deps/curl/curl_%.bbappend b/recipes-deps/curl/curl_%.bbappend
index d62008f..1418a31 100644
--- a/recipes-deps/curl/curl_%.bbappend
+++ b/recipes-deps/curl/curl_%.bbappend
@@ -17,4 +17,11 @@
 #	--enable-hidden-symbols \
 #"
 
-CFLAGS += "-fPIC"
+#BUILD_CFLAGS += "-fPIC"
+#TARGET_CFLAGS += "-fPIC"
+
+#| note: /usr/bin/ld: .../tmp/work/x86_64-linux/cargo-native/2014-11-07-r0/git/target/x86_64-unknown-linux-gnu/deps/libcurl-f3f9ef32955b72e6.rlib(r-curl-libcurl_la-openssl.o): undefined reference to symbol 'SSL_CTX_set_cipher_list'
+#| /usr/lib/libssl.so.1.0.0: error adding symbols: DSO missing from command line
+#DEPENDS_append = "openssl"
+PACKAGECONFIG = "ipv6"
+CFLAGS_append = " -fPIC"
diff --git a/recipes-deps/libgit2/libgit2.inc b/recipes-deps/libgit2/libgit2.inc
index d7b6de5..286ec34 100644
--- a/recipes-deps/libgit2/libgit2.inc
+++ b/recipes-deps/libgit2/libgit2.inc
@@ -8,9 +8,20 @@ LIC_FILES_CHKSUM = "\
 	file://COPYING;md5=29c24df0df4c2bab5efb8d5a33a73202 \
 "
 
+DEPENDS = "zlib"
+
 inherit cmake
 
 # CLAR = tests, needs python-native
-EXTRA_OECMAKE = "-DBUILD_CLAR=OFF"
+EXTRA_OECMAKE = "\
+	-DTHREADSAFE=ON \
+	-DBUILD_CLAR=OFF \
+	-DSHA1_TYPE="builtin" \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DBUILD_EXAMPLES=OFF \
+"
+
+CFLAGS_append .= " -fPIC"
 
 BBCLASSEXTEND = "native"
diff --git a/recipes-deps/zlib/zlib_%.bbappend b/recipes-deps/zlib/zlib_%.bbappend
index 8361cf4..93cb4b2 100644
--- a/recipes-deps/zlib/zlib_%.bbappend
+++ b/recipes-deps/zlib/zlib_%.bbappend
@@ -1,3 +1,3 @@
 # cargo tries to build a shared object using several static objects, one of
-# which includes the contenst of zlib (zutil.o)
-CFLAGS += "-fPIC"
+# which includes the contents of zlib (zutil.o as 'libcurl-f3f9ef32955b72e6.rlib(r-z-zutil.o)')
+CFLAGS_append = " -fPIC"
diff --git a/recipes/cargo/cargo.inc b/recipes/cargo/cargo.inc
index 537e57d..a46d4d4 100644
--- a/recipes/cargo/cargo.inc
+++ b/recipes/cargo/cargo.inc
@@ -6,14 +6,15 @@ LICENSE = "MIT | Apache-2.0"
 
 DEPENDS = "openssl-native rust-native zlib-native libgit2-native curl-native ca-certificates-native"
 
-SRC_URI = "git://github.com/rust-lang/cargo.git;protocol=https"
+SRC_URI = "git://github.com/rust-lang/cargo.git;protocol=https;name=cargo"
 
 LIC_FILES_CHKSUM ="\
 	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
 	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
 	file://LICENSE-THIRD-PARTY;md5=afbb7ae0aa70c8e437a007314eae5f3b \
 "
-#PV = "0.0.0+0.0.1-pre+git${SRCPV}"
+SRCREV_FORMAT = "cargo"
+PV .= "+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 B = "${S}"
@@ -30,16 +31,18 @@ do_configure () {
 		"--infodir=${infodir}"			\
 		"--mandir=${mandir}"			\
 		"--libdir=${libdir}"
+
+	# cargo downloads a cargo snapshot to build itself using cargo, we need
+	# to override it's arch info.
+	oe_cargo_config
 }
 
 do_compile () {
 	echo "COMPILE ${PN}"
 	env
-	# cargo downloads a cargo snapshot to build itself using cargo, we need
-	# to override it's arch info.
-	oe_cargo_config
 
 	export RUST_PATH="${RUST_PATH}"
+	export LD_LIBRARY_PATH="${RUST_PATH}"
 	oe_runmake ARGS="--verbose"
 }
 
diff --git a/recipes/cargo/cargo_2014-11-10.bb b/recipes/cargo/cargo_2014-11-10.bb
new file mode 100644
index 0000000..cb63733
--- /dev/null
+++ b/recipes/cargo/cargo_2014-11-10.bb
@@ -0,0 +1,10 @@
+SRCREV_cargo = "8cc600a33436a3c75372b252ddecb1f90961d61b"
+require cargo.inc
+
+SRC_URI_append = " \
+	git://github.com/jmesmon/git2-rs.git;protocol=https;name=git2-rs;destsuffix=git2-rs \
+"
+#git://github.com/jmesmon/libz-sys.git;protocol=https;name=libz-sys;destsuffix=libz-sys
+SRCREV_git2-rs  = "fa270b5eed7e9e94aa7d8bc18fa923d8e6b32ba6"
+#SRCREV_libz-sys = "
+OECARGO_PATH = "${WORKDIR}/git2-rs"