From fa6fcbc9f75bc5a5962f9dd4327ae80ea35c59a7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 1 Oct 2017 17:49:40 +0200
Subject: frosted: fix config for qemu

---
 toolchain/elf2flt/Makefile.inc                     | 13 +++++++++----
 toolchain/newlib/Makefile.inc                      |  3 ++-
 toolchain/newlib/patches/frosted/fix-tooldir.patch | 12 ++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 toolchain/newlib/patches/frosted/fix-tooldir.patch

(limited to 'toolchain')

diff --git a/toolchain/elf2flt/Makefile.inc b/toolchain/elf2flt/Makefile.inc
index 969b2cb8f..d3feb54a0 100644
--- a/toolchain/elf2flt/Makefile.inc
+++ b/toolchain/elf2flt/Makefile.inc
@@ -2,14 +2,19 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		elf2flt
+PKG_VERSION:=		6d80ab6c93409e796f85da404bde84b841231531
+PKG_GIT:=		hash
+PKG_RELEASE:=		1
+PKG_SITES:=		https://github.com/uclinux-dev/elf2flt.git
 ifeq ($(ADK_TARGET_ARCH_H8300),y)
 PKG_VERSION:=		h8300
 PKG_GIT:=		branch
 PKG_RELEASE:=		1
 PKG_SITES:=		git://git.osdn.net/gitroot/uclinux-h8/elf2flt.git
-else
-PKG_VERSION:=		6d80ab6c93409e796f85da404bde84b841231531
-PKG_GIT:=		hash
+endif
+ifeq ($(ADK_TARGET_OS_FROSTED),y)
+PKG_VERSION:=		master
+PKG_GIT:=		branch
 PKG_RELEASE:=		1
-PKG_SITES:=		https://github.com/uclinux-dev/elf2flt.git
+PKG_SITES:=		https://github.com/insane-adding-machines/elf2flt-1.git
 endif
diff --git a/toolchain/newlib/Makefile.inc b/toolchain/newlib/Makefile.inc
index 3fe740835..31622c2b8 100644
--- a/toolchain/newlib/Makefile.inc
+++ b/toolchain/newlib/Makefile.inc
@@ -23,7 +23,8 @@ PKG_SITES:=		https://github.com/riscv/riscv-newlib.git
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 endif
 ifeq ($(ADK_TARGET_LIB_NEWLIB_FROSTED),y)
-PKG_VERSION:=		git
+PKG_VERSION:=		frosted
+PKG_GIT:=		branch
 PKG_RELEASE:=		1
 PKG_GIT_SUBMODULE:=	1
 PKG_SITES:=		https://github.com/insane-adding-machines/newlib.git
diff --git a/toolchain/newlib/patches/frosted/fix-tooldir.patch b/toolchain/newlib/patches/frosted/fix-tooldir.patch
new file mode 100644
index 000000000..652f7494b
--- /dev/null
+++ b/toolchain/newlib/patches/frosted/fix-tooldir.patch
@@ -0,0 +1,12 @@
+diff -Nur newlib-2.2.0-1.orig/configure newlib-2.2.0-1/configure
+--- newlib-2.2.0-1.orig/configure	2014-07-05 23:09:07.000000000 +0200
++++ newlib-2.2.0-1/configure	2015-11-25 06:33:11.461178398 +0100
+@@ -6985,7 +6985,7 @@
+ 
+ # Some systems (e.g., one of the i386-aix systems the gas testers are
+ # using) don't handle "\$" correctly, so don't use it here.
+-tooldir='${exec_prefix}'/${target_noncanonical}
++tooldir='${exec_prefix}'
+ build_tooldir=${tooldir}
+ 
+ # Create a .gdbinit file which runs the one in srcdir
-- 
cgit v1.2.3