Hello,

This update goes with my last email for the xtensa-esp32-elf port. It is
just some patch updates to work with the new version number.

I've tested this out on sparc64 and amd64 with no issues.

Ok to commit?

-- 

Tracey Emery

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/arduino-esp32/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- Makefile    3 Jul 2020 21:12:38 -0000       1.2
+++ Makefile    19 Oct 2020 14:14:35 -0000
@@ -4,7 +4,7 @@ COMMENT =       esp32 arduino core toolset
 V =            1.0.4
 DISTNAME =     esp32-${V}
 PKGNAME =      arduino-${DISTNAME}
-REVISION =     0
+REVISION =     1
 
 CATEGORIES =   devel
 
Index: patches/patch-platform_txt
===================================================================
RCS file: /cvs/ports/devel/arduino-esp32/patches/patch-platform_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-platform_txt
--- patches/patch-platform_txt  23 Apr 2020 14:30:30 -0000      1.1.1.1
+++ patches/patch-platform_txt  19 Oct 2020 14:14:35 -0000
@@ -37,7 +37,7 @@ Index: platform.txt
 -compiler.path={runtime.tools.xtensa-esp32-elf-gcc.path}/bin/
  compiler.sdk.path={runtime.platform.path}/tools/sdk
 -compiler.cpreprocessor.flags=-DESP_PLATFORM 
-DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DHAVE_CONFIG_H -DGCC_NOT_5_2_0=0 
-DWITH_POSIX "-I{compiler.sdk.path}/include/config" 
"-I{compiler.sdk.path}/include/app_trace" 
"-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/asio" 
"-I{compiler.sdk.path}/include/bootloader_support" 
"-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/coap" 
"-I{compiler.sdk.path}/include/console" "-I{compiler.sdk.path}/include/driver" 
"-I{compiler.sdk.path}/include/esp-tls" "-I{compiler.sdk.path}/include/esp32" 
"-I{compiler.sdk.path}/include/esp_adc_cal" 
"-I{compiler.sdk.path}/include/esp_event" 
"-I{compiler.sdk.path}/include/esp_http_client" 
"-I{compiler.sdk.path}/include/esp_http_server" 
"-I{compiler.sdk.path}/include/esp_https_ota" 
"-I{compiler.sdk.path}/include/esp_ringbuf" 
"-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/expat" 
"-I{compiler.sdk.path}/include/fatfs" 
"-I{compiler.sdk.path}/include/freemodbus" 
"-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/heap" 
"-I{compiler.sdk.path}/include/idf_test" "-I{compiler.sdk.path}/include/jsmn" 
"-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/libsodium" 
"-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/lwip" 
"-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mdns" 
"-I{compiler.sdk.path}/include/micro-ecc" "-I{compiler.sdk.path}/include/mqtt" 
"-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nghttp" 
"-I{compiler.sdk.path}/include/nvs_flash" 
"-I{compiler.sdk.path}/include/openssl" 
"-I{compiler.sdk.path}/include/protobuf-c" 
"-I{compiler.sdk.path}/include/protocomm" 
"-I{compiler.sdk.path}/include/pthread" "-I{compiler.sdk.path}/include/sdmmc" 
"-I{compiler.sdk.path}/include/smartconfig_ack" 
"-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" 
"-I{compiler.sdk.path}/include/spiffs" 
"-I{compiler.sdk.path}/include/tcp_transport" 
"-I{compiler.sdk.path}/include/tcpip_adapter" 
"-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/vfs" 
"-I{compiler.sdk.path}/include/wear_levelling" 
"-I{compiler.sdk.path}/include/wifi_provisioning" 
"-I{compiler.sdk.path}/include/wpa_supplicant" 
"-I{compiler.sdk.path}/include/xtensa-debug-module" 
"-I{compiler.sdk.path}/include/esp-face" 
"-I{compiler.sdk.path}/include/esp32-camera" 
"-I{compiler.sdk.path}/include/esp-face" "-I{compiler.sdk.path}/include/fb_gfx"
-+compiler.cpreprocessor.flags=-DESP_PLATFORM 
-DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -nostdinc -DHAVE_CONFIG_H 
-DGCC_NOT_5_2_0=0 -DWITH_POSIX 
"-I/usr/local/xtensa-esp32-elf/include/c++/8.2.0/xtensa-esp32-elf" 
"-I/usr/local/xtensa-esp32-elf/include/c++/8.2.0/" 
"-I/usr/local/lib/gcc/xtensa-esp32-elf/8.2.0/include" 
"-I/usr/local/lib/gcc/xtensa-esp32-elf/8.2.0/include-fixed/" 
"-I{compiler.sdk.path}/include/config" 
"-I{compiler.sdk.path}/include/app_trace" 
"-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/asio" 
"-I{compiler.sdk.path}/include/bootloader_support" 
"-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/coap" 
"-I{compiler.sdk.path}/include/console" "-I{compiler.sdk.path}/include/driver" 
"-I{compiler.sdk.path}/include/esp-tls" "-I{compiler.sdk.path}/include/esp32" 
"-I{compiler.sdk.path}/include/esp_adc_cal" 
"-I{compiler.sdk.path}/include/esp_event" 
"-I{compiler.sdk.path}/include/esp_http_client" 
"-I{compiler.sdk.path}/include/esp_http_server" 
"-I{compiler.sdk.path}/include/esp_https_ota" 
"-I{compiler.sdk.path}/include/esp_ringbuf" 
"-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/expat" 
"-I{compiler.sdk.path}/include/fatfs" 
"-I{compiler.sdk.path}/include/freemodbus" 
"-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/heap" 
"-I{compiler.sdk.path}/include/idf_test" "-I{compiler.sdk.path}/include/jsmn" 
"-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/libsodium" 
"-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/lwip" 
"-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mdns" 
"-I{compiler.sdk.path}/include/micro-ecc" "-I{compiler.sdk.path}/include/mqtt" 
"-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nghttp" 
"-I{compiler.sdk.path}/include/nvs_flash" 
"-I{compiler.sdk.path}/include/openssl" 
"-I{compiler.sdk.path}/include/protobuf-c" 
"-I{compiler.sdk.path}/include/protocomm" 
"-I{compiler.sdk.path}/include/pthread" "-I{compiler.sdk.path}/include/sdmmc" 
"-I{compiler.sdk.path}/include/smartconfig_ack" 
"-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" 
"-I{compiler.sdk.path}/include/spiffs" 
"-I{compiler.sdk.path}/include/tcp_transport" 
"-I{compiler.sdk.path}/include/tcpip_adapter" 
"-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/vfs" 
"-I{compiler.sdk.path}/include/wear_levelling" 
"-I{compiler.sdk.path}/include/wifi_provisioning" 
"-I{compiler.sdk.path}/include/wpa_supplicant" 
"-I{compiler.sdk.path}/include/xtensa-debug-module" 
"-I{compiler.sdk.path}/include/esp-face" 
"-I{compiler.sdk.path}/include/esp32-camera" 
"-I{compiler.sdk.path}/include/esp-face" "-I{compiler.sdk.path}/include/fb_gfx"
++compiler.cpreprocessor.flags=-DESP_PLATFORM 
-DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -nostdinc -DHAVE_CONFIG_H 
-DGCC_NOT_5_2_0=0 -DWITH_POSIX 
"-I${LOCALBASE}/xtensa-esp32-elf/include/c++/8.4.0/xtensa-esp32-elf" 
"-I${LOCALBASE}/xtensa-esp32-elf/include/c++/8.4.0/" 
"-I${LOCALBASE}/lib/gcc/xtensa-esp32-elf/8.4.0/include" 
"-I${LOCALBASE}/lib/gcc/xtensa-esp32-elf/8.4.0/include-fixed/" 
"-I{compiler.sdk.path}/include/config" 
"-I{compiler.sdk.path}/include/app_trace" 
"-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/asio" 
"-I{compiler.sdk.path}/include/bootloader_support" 
"-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/coap" 
"-I{compiler.sdk.path}/include/console" "-I{compiler.sdk.path}/include/driver" 
"-I{compiler.sdk.path}/include/esp-tls" "-I{compiler.sdk.path}/include/esp32" 
"-I{compiler.sdk.path}/include/esp_adc_cal" 
"-I{compiler.sdk.path}/include/esp_event" 
"-I{compiler.sdk.path}/include/esp_http_client" 
"-I{compiler.sdk.path}/include/esp_http_server" 
"-I{compiler.sdk.path}/include/esp_https_ota" 
"-I{compiler.sdk.path}/include/esp_ringbuf" 
"-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/expat" 
"-I{compiler.sdk.path}/include/fatfs" 
"-I{compiler.sdk.path}/include/freemodbus" 
"-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/heap" 
"-I{compiler.sdk.path}/include/idf_test" "-I{compiler.sdk.path}/include/jsmn" 
"-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/libsodium" 
"-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/lwip" 
"-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mdns" 
"-I{compiler.sdk.path}/include/micro-ecc" "-I{compiler.sdk.path}/include/mqtt" 
"-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nghttp" 
"-I{compiler.sdk.path}/include/nvs_flash" 
"-I{compiler.sdk.path}/include/openssl" 
"-I{compiler.sdk.path}/include/protobuf-c" 
"-I{compiler.sdk.path}/include/protocomm" 
"-I{compiler.sdk.path}/include/pthread" "-I{compiler.sdk.path}/include/sdmmc" 
"-I{compiler.sdk.path}/include/smartconfig_ack" 
"-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" 
"-I{compiler.sdk.path}/include/spiffs" 
"-I{compiler.sdk.path}/include/tcp_transport" 
"-I{compiler.sdk.path}/include/tcpip_adapter" 
"-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/vfs" 
"-I{compiler.sdk.path}/include/wear_levelling" 
"-I{compiler.sdk.path}/include/wifi_provisioning" 
"-I{compiler.sdk.path}/include/wpa_supplicant" 
"-I{compiler.sdk.path}/include/xtensa-debug-module" 
"-I{compiler.sdk.path}/include/esp-face" 
"-I{compiler.sdk.path}/include/esp32-camera" 
"-I{compiler.sdk.path}/include/esp-face" "-I{compiler.sdk.path}/include/fb_gfx"
  
  compiler.c.cmd=xtensa-esp32-elf-gcc
  compiler.c.flags=-std=gnu99 -Os -g3 -fstack-protector -ffunction-sections 
-fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib 
-Wpointer-arith {compiler.warning_flags} -Wno-maybe-uninitialized 
-Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable 
-Wno-deprecated-declarations -Wno-unused-parameter -Wno-sign-compare 
-Wno-old-style-declaration -MMD -c

Reply via email to