From 34ddfb3bb8591e23f2174aa95e768eb4b48b8157 Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>
Date: Mar 08 2016 11:11:23 +0000
Subject: - Fix curl shared object linking.

- Move git ahead of curl to build w/ Curl support.

---

diff --git a/331.git.build b/331.git.build
deleted file mode 120000
index 52bb82e..0000000
--- a/331.git.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/331.openssh.build b/331.openssh.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/331.openssh.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/333.openssh.build b/333.openssh.build
deleted file mode 120000
index 52bb82e..0000000
--- a/333.openssh.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/364.git.build b/364.git.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/364.git.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/build.vars b/build.vars
index 7669917..e6a07b0 100644
--- a/build.vars
+++ b/build.vars
@@ -100,8 +100,10 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_CURL_VERSION:=7.47.1};
 : ${PKG_CURL_SHA256SUM:=ddc643ab9382e24bbe4747d43df189a0a6ce38fcb33df041b9cb0b3cd47ae98f};
 : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.bz2};
+: ${PKG_CURL_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_LVL3}/lib};
 : ${PKG_CURL_LIBFILES_FIX:=1};
 : ${PKG_CURL_LIBTOOL_MIDIPIX:=1};
+: ${PKG_CURL_MAKEFLAGS_BUILD_EXTRA:=V=99};
 : ${PKG_DASH_VERSION:=0.5.8};
 : ${PKG_DASH_SHA256SUM:=c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f};
 : ${PKG_DASH_URL:=http://gondor.apana.org.au/~herbert/dash/files/dash-${PKG_DASH_VERSION}.tar.gz};
@@ -126,8 +128,8 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_GIT_LDFLAGS_BUILD_EXTRA:=--sysroot=${PREFIX_LVL3}};
 : ${PKG_GIT_LDFLAGS_INSTALL_EXTRA:=--sysroot=${PREFIX_LVL3}};
 : ${PKG_GIT_LIBFILES_FIX:=1};
-: ${PKG_GIT_MAKEFLAGS_BUILD_EXTRA:=NO_CURL=1 NO_PERL=1 prefix=${PREFIX_LVL3} V=99};
-: ${PKG_GIT_MAKEFLAGS_INSTALL:=NO_CURL=1 NO_PERL=1 prefix=${PREFIX_LVL3} V=99};
+: ${PKG_GIT_MAKEFLAGS_BUILD_EXTRA:=NO_EXPAT=1 NO_PERL=1 prefix=${PREFIX_LVL3} V=99};
+: ${PKG_GIT_MAKEFLAGS_INSTALL:=NO_PERL=1 prefix=${PREFIX_LVL3} V=99};
 : ${PKG_GIT_RANLIB_INSTALL:=${HOST_NATIVE}-ranlib};
 : ${PKG_GIT_SUBDIR:=git};
 : ${PKG_GIT_URL:=https://github.com/git/git.git};
diff --git a/curl-7.47.1.local.patch b/curl-7.47.1.local.patch
index d014827..430db3d 100644
--- a/curl-7.47.1.local.patch
+++ b/curl-7.47.1.local.patch
@@ -20,3 +20,40 @@
  	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+--- curl-7.47.1/configure.orig	2016-02-07 15:43:48.000000000 +0100
++++ curl-7.47.1/configure	2016-03-08 11:33:24.125711200 +0100
+@@ -14297,6 +14297,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++midipix*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
++  soname_spec="\${libname}\${release}\${shared_ext}\$major"
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=no
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
+ netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+@@ -42993,3 +43005,15 @@
+ 
+ fi
+ 
++# a transitional workaround...
++case $host_os in
++		midipix*)
++			cp $ac_confdir/libtool.midipix libtool || exit 2
++
++			sed -i	-e 's/@cbb_host_os@/'$host'/g' \
++				-e 's/@cbb_build_alias@/'$build_alias'/g' \
++				-e 's/@cbb_build_os@/'$build_os'/g' \
++				-e 's/@cbb_build@/'$build'/g' libtool || exit 2
++			;;
++esac
++