diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2022-11-03 19:37:32 +0000 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2022-11-03 19:37:32 +0000 |
| commit | 17c6c2a8aef24d673573f90c68e036b61af847c6 (patch) | |
| tree | 4c401cee44d728126cffe647ef71da05e739b44e | |
| parent | 74abeb4f03f7e3dc2a9658c7a3d6d2d732021eed (diff) | |
| download | toolchains-17c6c2a8aef24d673573f90c68e036b61af847c6.tar.gz toolchains-17c6c2a8aef24d673573f90c68e036b61af847c6.tar.bz2 | |
SDK: follow arm-riscos-gnueabi triplet rename
| -rw-r--r-- | sdk/Makefile | 4 | ||||
| -rw-r--r-- | sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p | 4 | ||||
| -rw-r--r-- | sdk/recipes/patches/openssl/Configure.p | 2 | ||||
| -rw-r--r-- | sdk/recipes/patches/zlib/arm-riscos-gnueabi/configure.p (renamed from sdk/recipes/patches/zlib/arm-riscos-gnueabihf/configure.p) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index fc4ecd7..357061f 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -7,7 +7,7 @@ # GCCSDK_INSTALL_CROSSBIN -- /path/to/toolchain/bin # # supported targets are: -# arm-riscos-gnueabihf +# arm-riscos-gnueabi # arm-unknown-riscos # m68k-atari-mint # m5475-atari-mint @@ -122,7 +122,7 @@ FREETYPE_ENV := LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --cflag LIBJPEG_TURBO_BUILDDIR:=$(BUILDDIR)/libjpegturbo # Target Specific setup -ifeq ($(TARGET),arm-riscos-gnueabihf) +ifeq ($(TARGET),arm-riscos-gnueabi) SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) libjpeg-turbo.d libwebp.d) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --with-random="/dev/urandom" $(LIBCURL_DISABLES) diff --git a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p index f3d4dc1..c3f2fe5 100644 --- a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p +++ b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p @@ -15,9 +15,9 @@ + bn_ops => "BN_LLONG", + }, + -+ "arm-riscos-gnueabihf" => { ++ "arm-riscos-gnueabi" => { + inherit_from => [ "BASE_unix" ], -+ cc => "arm-riscos-gnueabihf-gcc", ++ cc => "arm-riscos-gnueabi-gcc", + cflags => picker(default => "-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H", + debug => "-O0 -g", + release => "-O3 ", diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p index f44d99d..aff7878 100644 --- a/sdk/recipes/patches/openssl/Configure.p +++ b/sdk/recipes/patches/openssl/Configure.p @@ -4,7 +4,7 @@ $target{cxxflags}//=$target{cflags} if $target{CXX}; $target{exe_extension}=".exe" if ($config{target} eq "DJGPP"); $target{exe_extension}=".pm" if ($config{target} =~ /vos/); -+$target{exe_extension}=",e1f" if ($config{target} eq "arm-riscos-gnueabihf"); ++$target{exe_extension}=",e1f" if ($config{target} eq "arm-riscos-gnueabi"); +$target{exe_extension}=",e1f" if ($config{target} eq "arm-unknown-riscos"); # Fill %config with values from %user, and in case those are undefined or diff --git a/sdk/recipes/patches/zlib/arm-riscos-gnueabihf/configure.p b/sdk/recipes/patches/zlib/arm-riscos-gnueabi/configure.p index 24d7a7e..24d7a7e 100644 --- a/sdk/recipes/patches/zlib/arm-riscos-gnueabihf/configure.p +++ b/sdk/recipes/patches/zlib/arm-riscos-gnueabi/configure.p |