Merge branch 'devel1'

This commit is contained in:
fautomat
2019-04-14 11:56:46 +02:00
2 changed files with 7 additions and 6 deletions
+4 -3
View File
@@ -20,6 +20,7 @@ GCC_VERSION ?= $(shell cat 2>/dev/null projects/gcc/gcc/BASE-VER)
BINUTILS_BRANCH := amiga
GCC_BRANCH := gcc-6-branch
NEWLIB_BRANCH := amiga
GIT_AMIGA_NETINCLUDE := https://github.com/bebbo/amiga-netinclude
GIT_BINUTILS := https://github.com/bebbo/binutils-gdb
@@ -98,8 +99,8 @@ UPDATE = __x=
ANDPULL = ;__y=$$(git branch | grep '*' | cut -b3-);echo setting remote origin from $$(git remote get-url origin) to $$__x using branch $$__y;\
git remote remove origin; \
git remote add origin $$__x; \
git pull origin $$__y;\
git branch --set-upstream-to=origin/$$__y $$__y; \
git remote set-branches origin $$__y;\
git pull
# =================================================
@@ -922,7 +923,7 @@ $(BUILD)/newlib/newlib/Makefile: projects/newlib-cygwin/configure
projects/newlib-cygwin/newlib/configure:
@mkdir -p projects
@cd projects && git clone -b amiga --depth 4 $(GIT_NEWLIB_CYGWIN)
@cd projects && git clone -b $(NEWLIB_BRANCH) --depth 4 $(GIT_NEWLIB_CYGWIN)
# =================================================
# ixemul
+3 -3
View File
@@ -17,13 +17,13 @@ Right now these tools are build:
# Short Guide
## Prerequisites
### Centos
`sudo yum install gcc gcc-c++ python git perl-Pod-Simple gperf patch autoconf automake make makedepend bison flex ncurses-devel gmp-devel mpfr-devel libmpc-devel gettext-devel texinfo`
`sudo yum install wget gcc gcc-c++ python git perl-Pod-Simple gperf patch autoconf automake make makedepend bison flex ncurses-devel gmp-devel mpfr-devel libmpc-devel gettext-devel texinfo`
### Ubuntu
`sudo apt install make git gcc g++ lhasa libgmp-dev libmpfr-dev libmpc-dev flex bison gettext texinfo ncurses-dev`
`sudo apt install make wget git gcc g++ lhasa libgmp-dev libmpfr-dev libmpc-dev flex bison gettext texinfo ncurses-dev`
### macOS
Install Homebrew (https://brew.sh/) or any other package manager first. The compiler will be installed together with XCode. Once XCode and Homebrew are up install the required packages:
`brew install bash make lhasa gmp mpfr mpc flex gettext texinfo`
`brew install bash wget make lhasa gmp mpfr mpc flex gettext texinfo`
By default macOS uses an outdated version of bash. Therefore, on macOS host always pass the the SHELL=/usr/local/bin/bash parameter (or any other valid path pointing to bash), e.g.:
```