diff options
author | Sam Bazley | 2017-07-08 16:49:26 +0100 |
---|---|---|
committer | Sam Bazley | 2017-07-08 16:49:26 +0100 |
commit | c096b2b8e1a814c9e18dc33b43fbd03fe5af6765 (patch) | |
tree | 5256f8e77dc4b713145899e72a3b704bf5c24be7 | |
parent | 4aaa5fba409c0fe136c75c65a5c9ce9bc007ae74 (diff) | |
download | aur-c096b2b8e1a814c9e18dc33b43fbd03fe5af6765.tar.gz |
Updated patches, fixed libgcc problem
-rw-r--r-- | Makefile.patch | 8 | ||||
-rw-r--r-- | PKGBUILD | 3 | ||||
-rw-r--r-- | blinky_Makefile.patch | 9 | ||||
-rw-r--r-- | crosstool-config-overrides.patch | 7 |
4 files changed, 14 insertions, 13 deletions
diff --git a/Makefile.patch b/Makefile.patch index 1cf566bc7cf3..2ae8c68e68ca 100644 --- a/Makefile.patch +++ b/Makefile.patch @@ -1,6 +1,6 @@ ---- Makefile.old 2017-02-09 22:44:09.998928546 +0000 -+++ Makefile 2017-02-09 22:44:35.886338414 +0000 -@@ -72,11 +72,6 @@ +--- Makefile.old 2017-07-08 15:09:55.173934172 +0100 ++++ Makefile 2017-07-08 15:11:04.734742551 +0100 +@@ -74,11 +74,6 @@ all: esptool libcirom standalone sdk sdk_patch $(TOOLCHAIN)/xtensa-lx106-elf/sysroot/usr/lib/libhal.a $(TOOLCHAIN)/bin/xtensa-lx106-elf-gcc lwip @@ -12,7 +12,7 @@ ifneq ($(STANDALONE),y) @echo "Espressif ESP8266 SDK is installed. Toolchain contains only Open Source components" @echo "To link external proprietary libraries add:" -@@ -118,7 +113,6 @@ +@@ -120,7 +115,6 @@ esptool: toolchain @@ -1,6 +1,6 @@ #Maintainer: Sam Bazley <samb1999@hotmail.co.uk> pkgname=esp-open-sdk-git -pkgver=20170528090946 +pkgver=20170708154850 pkgrel=1 pkgdesc="Free and open (as much as possible) integrated SDK for ESP8266 chips" arch=("i686" "x86_64") @@ -33,6 +33,7 @@ prepare() { build() { cd "$srcdir"/esp-open-sdk CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS= LD_LIBRARY_PATH= make + cp sdk/lib/libgcc.a xtensa-lx106-elf/lib/gcc/xtensa-lx106-elf/4.8.5 } package() { diff --git a/blinky_Makefile.patch b/blinky_Makefile.patch index a0dd04c13b4c..18d048d02fa5 100644 --- a/blinky_Makefile.patch +++ b/blinky_Makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.old 2017-02-08 21:50:27.971401267 +0000 -+++ Makefile 2017-02-08 21:51:25.598659966 +0000 +--- Makefile.old 2017-07-08 15:16:42.175322168 +0100 ++++ Makefile 2017-07-08 15:17:45.842725952 +0100 @@ -4,14 +4,14 @@ LDFLAGS = -Teagle.app.v6.ld @@ -12,9 +12,8 @@ blinky.o: blinky.c flash: blinky-0x00000.bin -- esptool.py write_flash 0 blinky-0x00000.bin 0x40000 blinky-0x40000.bin +- esptool.py write_flash 0 blinky-0x00000.bin 0x10000 blinky-0x10000.bin + esptool write_flash 0 blinky-0x00000.bin 0x10000 blinky-0x10000.bin clean: -- rm -f blinky blinky.o blinky-0x00000.bin blinky-0x40000.bin -+ rm -f blinky blinky.o blinky-0x00000.bin blinky-0x10000.bin + rm -f blinky blinky.o blinky-0x00000.bin blinky-0x10000.bin diff --git a/crosstool-config-overrides.patch b/crosstool-config-overrides.patch index 91d83c55bcde..ccd9480cda9b 100644 --- a/crosstool-config-overrides.patch +++ b/crosstool-config-overrides.patch @@ -1,9 +1,10 @@ ---- crosstool-config-overrides.old 2017-02-09 20:31:35.367784868 +0000 -+++ crosstool-config-overrides 2017-02-09 20:31:40.017802432 +0000 -@@ -1,5 +1,5 @@ +--- crosstool-config-overrides.old 2017-07-08 15:08:14.192759182 +0100 ++++ crosstool-config-overrides 2017-07-08 15:08:50.223178640 +0100 +@@ -1,5 +1,6 @@ # Building static toolchain causes problems on some distros which # by default don't install static libs for all required dependencies -#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" |