MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-22 21:04:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #59 from ids1024/unknown

Browse Source 
Use -unknown- instead of -elf-
This commit is contained in:
Jeremy Soller 2017-08-07 18:09:56 -06:00 committed by GitHub
commit 88ddff174f
19 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cargo/config
View File

@ -1,3 +1,3 @@
[target.x86_64-unknown-redox]
linker = "x86_64-elf-redox-gcc"
linker = "x86_64-unknown-redox-gcc"
rustflags = []

6
config.sh
View File

@ -2,12 +2,14 @@
set -e
# Configuration
export TARGET=x86_64-unknown-redox
ARCH=x86_64
export TARGET=$ARCH-unknown-redox
HOST=$TARGET
# Automatic variables
ROOT="$(cd `dirname "$0"` && pwd)"
REPO="$ROOT/repo/$TARGET"
export CC="x86_64-elf-redox-gcc"
export CC="$HOST-gcc"
export XARGO_HOME="$ROOT/xargo"
if [[ "$OSTYPE" == "darwin"* ]]; then

2
recipes/curl/recipe.sh
View File

@ -2,8 +2,6 @@ GIT=https://github.com/ids1024/curl.git
BRANCH=redox
BUILD_DEPENDS=(openssl)
HOST=x86_64-elf-redox
function recipe_version {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
skip=1

1
recipes/dash/recipe.sh
View File

@ -1,7 +1,6 @@
GIT=https://github.com/redox-os/dash.git
BRANCH=redox
HOST=x86_64-elf-redox
export AR="${HOST}-ar"
export AS="${HOST}-as"
export CC="${HOST}-gcc"

2
recipes/diffutils/recipe.sh
View File

@ -1,8 +1,6 @@
VERSION=3.6
TAR=http://ftp.gnu.org/gnu/diffutils/diffutils-$VERSION.tar.xz
HOST=x86_64-elf-redox
function recipe_version {
echo "$VERSION"
skip=1

2
recipes/expat/recipe.sh
View File

@ -1,8 +1,6 @@
VERSION=2.2.1
TAR=http://downloads.sourceforge.net/project/expat/expat/$VERSION/expat-$VERSION.tar.bz2
HOST=x86_64-elf-redox
function recipe_version {
echo "$VERSION"
skip=1

2
recipes/gawk/recipe.sh
View File

@ -1,8 +1,6 @@
GIT=https://github.com/redox-os/gawk
BRANCH=redox
HOST=x86_64-elf-redox
function recipe_update {
echo "skipping update"
skip=1

3
recipes/gcc/recipe.sh
View File

@ -1,7 +1,6 @@
GIT=https://github.com/redox-os/gcc.git
BRANCH=redox
HOST=x86_64-elf-redox
export AR="${HOST}-ar"
export AS="${HOST}-as"
export CC="${HOST}-gcc"
@ -52,7 +51,7 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
make DESTDIR="$dest" install-gcc install-target-libgcc install-target-libstdc++-v3
find "$dest"/{bin,libexec} -exec x86_64-elf-redox-strip {} ';' 2> /dev/null
find "$dest"/{bin,libexec} -exec $STRIP {} ';' 2> /dev/null
ln -s "gcc" "$1/bin/cc"
skip=1
}

2
recipes/git/recipe.sh
View File

@ -2,8 +2,6 @@ VERSION=2.13.1
TAR=https://www.kernel.org/pub/software/scm/git/git-$VERSION.tar.xz
BUILD_DEPENDS=(zlib curl openssl expat)
HOST=x86_64-elf-redox
export AR="${HOST}-ar"
export AS="${HOST}-as"
export CC="${HOST}-gcc"

5
recipes/gnu-binutils/recipe.sh
View File

@ -1,6 +1,5 @@
GIT=https://github.com/redox-os/binutils-gdb.git
HOST=x86_64-elf-redox
export AR="${HOST}-ar"
export AS="${HOST}-as"
export CC="${HOST}-gcc"
@ -24,7 +23,7 @@ function recipe_update {
}
function recipe_build {
./configure --host=${HOST} --target=${HOST} --prefix=/ --with-sysroot=/usr/x86_64-elf-redox --disable-gdb --disable-nls --disable-werror
./configure --host=${HOST} --target=${HOST} --prefix=/ --with-sysroot=/usr/$HOST --disable-gdb --disable-nls --disable-werror
make
skip=1
}
@ -42,6 +41,6 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
make DESTDIR="$dest" install
find "$dest/bin" -exec x86_64-elf-redox-strip {} ';' 2> /dev/null
find "$dest/bin" -exec $STRIP {} ';' 2> /dev/null
skip=1
}

2
recipes/gnu-grep/recipe.sh
View File

@ -1,8 +1,6 @@
VERSION=3.1
TAR=https://ftp.gnu.org/gnu/grep/grep-$VERSION.tar.xz
HOST=x86_64-elf-redox
function recipe_version {
echo "$VERSION"
skip=1

2
recipes/gnu-make/recipe.sh
View File

@ -1,8 +1,6 @@
VERSION=4.2.1
TAR=https://ftp.gnu.org/gnu/make/make-$VERSION.tar.gz
HOST=x86_64-elf-redox
export AR="${HOST}-ar"
export AS="${HOST}-as"
export CC="${HOST}-gcc"

2
recipes/lua/recipe.sh
View File

@ -1,8 +1,6 @@
VERSION=5.3.1
TAR=http://www.lua.org/ftp/lua-$VERSION.tar.gz
HOST=x86_64-elf-redox
function recipe_version {
echo "$VERSION"
skip=1

2
recipes/nasm/recipe.sh
View File

@ -1,8 +1,6 @@
VERSION=2.13.01
TAR=http://www.nasm.us/pub/nasm/releasebuilds/$VERSION/nasm-$VERSION.tar.gz
HOST=x86_64-elf-redox
function recipe_version {
echo "$VERSION"
skip=1

6
recipes/newlib/recipe.sh
View File

@ -1,8 +1,6 @@
GIT=https://github.com/redox-os/newlib.git
BRANCH=redox
HOST=x86_64-elf-redox
function recipe_version {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
skip=1
@ -46,7 +44,7 @@ function recipe_stage {
dest="$(realpath $1)"
make DESTDIR="$dest" install
cd "$dest"
mv x86_64-elf-redox/* ./
rmdir x86_64-elf-redox
mv $HOST/* ./
rmdir $HOST
skip=1
}

4
recipes/openssl/recipe.sh
View File

@ -1,8 +1,6 @@
GIT=https://github.com/ids1024/openssl.git
BRANCH=redox
HOST=x86_64-elf-redox
function recipe_version {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
skip=1
@ -14,7 +12,7 @@ function recipe_update {
}
function recipe_build {
./Configure no-shared no-dgram redox-x86_64 --prefix="/"
./Configure no-shared no-dgram redox-$ARCH --prefix="/"
make -j"$(nproc)"
skip=1
}

3
recipes/python/recipe.sh
View File

@ -1,9 +1,6 @@
VERSION=3.6.1
TAR=https://www.python.org/ftp/python/$VERSION/Python-$VERSION.tar.xz
ARCH=x86_64
HOST=x86_64-elf-redox
export AR="${HOST}-ar"
export AS="${HOST}-as"
export CC="${HOST}-gcc"

12
recipes/rust/recipe.sh
View File

@ -1,13 +1,11 @@
GIT=https://github.com/ids1024/rust.git
BRANCH=compile-redox
ARCH=x86_64
HOST=x86_64-elf-redox
RUST_HOST=x86_64-unknown-redox
LLVM_PREFIX=$PWD/build/llvm-root
SYSROOT=/usr/x86_64-elf-redox
SYSROOT=/usr/$HOST
unset AR AS CC CXX LD NM OBJCOPY OBJDUMP RANLIB READELF STRIP
LLVM_CMAKE_ARGS=(-Wno-dev -DCMAKE_CROSSCOMPILING=True -DCMAKE_INSTALL_PREFIX="$LLVM_PREFIX" -DLLVM_DEFAULT_TARGET_TRIPLE=$HOST -DLLVM_TARGET_ARCH=$ARCH -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_SYSTEM_NAME=Generic -DPYTHON_EXECUTABLE=/usr/bin/python2 -DUNIX=1 -DLLVM_ENABLE_THREADS=Off -DLLVM_INCLUDE_TESTS=OFF -target=$HOST -DLLVM_TABLEGEN=/usr/bin/llvm-tblgen -I"$SYSROOT/include" -DCMAKE_CXX_FLAGS='--std=gnu++11' -DLLVM_TOOL_LTO_BUILD=Off -DLLVM_TOOL_LLVM_PROFDATA_BUILD=Off -DLLVM_TOOL_LLI_BUILD=Off -DLLVM_TOOL_RDOBJ_BUILD=Off -DLLVM_TOOL_LLVM_COV_BUILD=Off -DLLVM_TOOL_LLVM_XRAY_BUILD=Off -DLLVM_TOOL_LLVM_LTO2_BUILD=Off -DLLVM_TOOL_LLVM_LTO_BUILD=Off -DLLVM_TOOL_LLVM_RTDYLD_BUILD=Off)
function recipe_version {
@ -56,10 +54,10 @@ function recipe_clean {
function recipe_stage {
binpath="$1/bin"
libpath="$1/lib/rustlib/${RUST_HOST}/lib"
libpath="$1/lib/rustlib/${TARGET}/lib"
mkdir -p "$binpath" "$libpath"
cp -fv "build/${RUST_HOST}/stage2/bin/rustc" "$binpath"
cp -fv "build/${TARGET}/stage2/bin/rustc" "$binpath"
${HOST}-strip "$binpath/rustc"
cp -fv $(find build/${RUST_HOST}/stage2/lib/rustlib/${RUST_HOST}/lib/ -type f | grep -v librustc) "$libpath"
cp -fv $(find build/${TARGET}/stage2/lib/rustlib/${TARGET}/lib/ -type f | grep -v librustc) "$libpath"
skip=1
}

2
recipes/sed/recipe.sh
View File

@ -1,8 +1,6 @@
VERSION=4.4
TAR=http://ftp.gnu.org/gnu/sed/sed-$VERSION.tar.xz
HOST=x86_64-elf-redox
function recipe_version {
echo "$VERSION"
skip=1