fix build

6 files changed, 56 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a41f40abef82..a0ad3a0465dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = esp-open-sdk-git
 	pkgdesc = Free and open (as much as possible) integrated SDK for ESP8266 chips
-	pkgver = 1
-	pkgrel = 14
+	pkgver = 20181127203314
+	pkgrel = 1
 	url = https://github.com/pfalcon/esp-open-sdk
 	arch = i686
 	arch = x86_64
@@ -12,9 +12,7 @@ pkgbase = esp-open-sdk-git
 	makedepends = wget
 	makedepends = guile2.0
 	depends = python
-	depends = python2
 	depends = python-pyserial
-	depends = python2-pyserial
 	depends = esptool
 	provides = esp-open-sdk
 	conflicts = esp-open-sdk
diff --git a/PKGBUILD b/PKGBUILD
index 12bf849ba0e2..7e663dfa0046 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=esp-open-sdk-git
-pkgver=1
-pkgrel=14
+pkgver=20181127203314
+pkgrel=1
 pkgdesc="Free and open (as much as possible) integrated SDK for ESP8266 chips"
 arch=("i686" "x86_64")
 url="https://github.com/pfalcon/esp-open-sdk"
 makedepends=("git" "gperf" "help2man" "unzip" "wget" "guile2.0")
-depends=("python" "python2" "python-pyserial" "python2-pyserial" "esptool")
+depends=("python" "python-pyserial" "esptool")
 provides=("esp-open-sdk")
 conflicts=("esp-open-sdk")
 options=("!strip" "!buildflags" "!makeflags")
@@ -30,6 +30,9 @@ prepare() {
         < "$startdir"/crosstool-config-overrides.patch
     patch examples/blinky/Makefile < "$startdir"/blinky_Makefile.patch
     patch crosstool-NG/configure.ac < "$startdir"/crosstool_NG_configure.patch
+    patch crosstool-NG/scripts/build/companion_libs/121-isl.sh < "$startdir"/crosstool_NG_isl_url.patch
+    patch crosstool-NG/config/companion_libs/expat.in <"$startdir"/crosstool_NG_expat_ver.patch
+    patch crosstool-NG/scripts/build/companion_libs/210-expat.sh <"$startdir"/crosstool_NG_expat_url.patch
     mkdir -p crosstool-NG/local-patches/gdb/7.10
     cp "$srcdir"/1000-gdb-python-3-7.patch crosstool-NG/local-patches/gdb/7.10
 }
diff --git a/crosstool-config-overrides.patch b/crosstool-config-overrides.patch
index ccd9480cda9b..aed133978cab 100644
--- a/crosstool-config-overrides.patch
+++ b/crosstool-config-overrides.patch
@@ -6,5 +6,5 @@
 -#CT_STATIC_TOOLCHAIN=y
 +CT_STATIC_TOOLCHAIN=y
  CT_LIBC_NEWLIB_ENABLE_TARGET_OPTSPACE=y
-+CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--with-guile=guile-2.0"
- 
++CT_EXTRA_CFLAGS_FOR_BUILD="--std=c++11"
++CT_EXTRA_CFLAGS_FOR_HOST="--std=c++11"
diff --git a/crosstool_NG_expat_url.patch b/crosstool_NG_expat_url.patch
new file mode 100644
index 000000000000..85714f25a080
--- /dev/null
+++ b/crosstool_NG_expat_url.patch
@@ -0,0 +1,12 @@
+--- a/scripts/build/companion_libs/210-expat.sh
++++ b/scripts/build/companion_libs/210-expat.sh
+@@ -10,7 +10,7 @@
+ if [ "${CT_EXPAT_TARGET}" = "y" -o "${CT_EXPAT}" = "y" ]; then
+ 
+ do_expat_get() {
+     CT_GetFile "expat-${CT_EXPAT_VERSION}" .tar.gz    \
+-               http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}
++               https://sourceforge.net/projects/expat/files/expat/${CT_EXPAT_VERSION}
+ }
+ 
+ do_expat_extract() {
diff --git a/crosstool_NG_expat_ver.patch b/crosstool_NG_expat_ver.patch
new file mode 100644
index 000000000000..0e3d9a1e1580
--- /dev/null
+++ b/crosstool_NG_expat_ver.patch
@@ -0,0 +1,22 @@
+--- a/config/companion_libs/expat.in
++++ b/config/companion_libs/expat.in
+@@ -6,9 +6,9 @@
+ choice
+ # Don't remove next line
+ # CT_INSERT_VERSION_BELOW
+ 
+-config EXPAT_V_2_1_0
++config EXPAT_V_2_5_0
+     bool
+-    prompt "2.1.0"
++    prompt "2.5.0"
+ 
+ endchoice
+ 
+@@ -16,4 +16,4 @@
+ config EXPAT_VERSION
+     string
+ # Don't remove next line
+ # CT_INSERT_VERSION_STRING_BELOW
+-    default "2.1.0" if EXPAT_V_2_1_0
++    default "2.5.0" if EXPAT_V_2_5_0
diff --git a/crosstool_NG_isl_url.patch b/crosstool_NG_isl_url.patch
new file mode 100644
index 000000000000..151693dd1d2a
--- /dev/null
+++ b/crosstool_NG_isl_url.patch
@@ -0,0 +1,12 @@
+--- a/scripts/build/companion_libs/121-isl.sh
++++ b/scripts/build/companion_libs/121-isl.sh
+@@ -14,7 +14,7 @@
+ if [ "${CT_ISL}" = "y" ]; then
+ # Download ISL
+ do_isl_get() {
+     CT_GetFile "isl-${CT_ISL_VERSION}" \
+-        http://isl.gforge.inria.fr
++        ftp://gcc.gnu.org/pub/gcc/infrastructure
+ }
+ 
+ # Extract ISL