Merge Official Source

This commit is contained in:
CN_SZTL 2020-10-06 00:51:02 +08:00
commit 24adae9f77
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 10 additions and 10 deletions

View File

@ -12,9 +12,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
PKG_SOURCE_DATE:=2020-09-18
PKG_SOURCE_VERSION:=47c34bd6ad49cae408b8d7c150c6f9f324aaddf5
PKG_MIRROR_HASH:=31ee0eca69577380842588abc442526c23b2c20df13e79738843b8b417f99d17
PKG_SOURCE_DATE:=2020-10-04
PKG_SOURCE_VERSION:=14a3cb42047bd0c0f8d5713332b9b4516a505607
PKG_MIRROR_HASH:=10db75dcc3f42543028ccda1a32454cf8684108a5117befa466b6775fc71948c
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=ISC

View File

@ -14,9 +14,9 @@ choice
bool "Binutils 2.34"
select BINUTILS_VERSION_2_34
config BINUTILS_USE_VERSION_2_35
bool "Binutils 2.35"
select BINUTILS_VERSION_2_35
config BINUTILS_USE_VERSION_2_35_1
bool "Binutils 2.35.1"
select BINUTILS_VERSION_2_35_1
endchoice
config EXTRA_BINUTILS_CONFIG_OPTIONS

View File

@ -5,11 +5,11 @@ config BINUTILS_VERSION_2_34
default y if !TOOLCHAINOPTS
bool
config BINUTILS_VERSION_2_35
config BINUTILS_VERSION_2_35_1
bool
config BINUTILS_VERSION
string
default "2.32" if BINUTILS_VERSION_2_32
default "2.34" if BINUTILS_VERSION_2_34
default "2.35" if BINUTILS_VERSION_2_35
default "2.35.1" if BINUTILS_VERSION_2_35_1

View File

@ -23,8 +23,8 @@ ifeq ($(PKG_VERSION),2.34)
PKG_HASH:=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952
endif
ifeq ($(PKG_VERSION),2.35)
PKG_HASH:=1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85
ifeq ($(PKG_VERSION),2.35.1)
PKG_HASH:=3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
endif
HOST_BUILD_PARALLEL:=1