Build variants

This commit is contained in:
Ehmry - 2019-06-29 11:46:02 +02:00
parent 5306a4f385
commit b38e499ebf
10 changed files with 43 additions and 23 deletions

7
.gitignore vendored
View File

@ -3,10 +3,3 @@
##### Do not edit.
.tup
/.gitignore
/Makefile
/bin-list
/depot
/pkg.sed
/public
/raw-list
/versions.sed

View File

@ -1,5 +1,9 @@
.gitignore
ifndef TOOL_CHAIN_PREFIX
error TOOL_CHAIN_PREFIX not configured, missing variant?
endif
ifeq (@(TUP_ARCH),i386)
CC_MARCH = -march=i686 -m32
LD_MARCH = -melf_i386
@ -10,6 +14,10 @@ CC_MARCH = -m64 -mcmodel=large
LD_MARCH = -melf_x86_64
endif
ifeq (@(TUP_ARCH),arm_v8)
CC_MARCH = -march=armv8-a
endif
GENODE_DIR = $(TUP_CWD)/upstream
&STUB_DIR = upstream/stub
@ -95,7 +103,7 @@ AWK_LOCAL_ARCHIVES = awk -F '/' \
|> $(RAW_DIR)/%b
!collect_bin = |> ^ COLLECT %o^ \
strip -o %o %f \
@(TOOL_CHAIN_PREFIX)strip -o %o %f \
|> $(DEPOT_BIN_DIR)/$(BIN_NAME)/current/%b
!collect_pkg_runtime = | $(VERSIONS_SED_FILE) |> ^ package %f^ \
@ -130,10 +138,6 @@ ERRATA_DIR = $(TUP_CWD)/errata
export PKG_CONFIG_PATH
PKG_CONFIG = PKG_CONFIG_PATH=$(GENODE_DIR)/upstream:pkg-config:$PKG_CONFIG_PATH pkg-config
ifndef TOOL_CHAIN_PREFIX
error TOOL_CHAIN_PREFIX not configured
endif
CC = @(TOOL_CHAIN_PREFIX)gcc
CXX = @(TOOL_CHAIN_PREFIX)g++
LD= @(TOOL_CHAIN_PREFIX)ld

View File

@ -1 +0,0 @@
/.gitignore

12
configs/arm_v8.config Normal file
View File

@ -0,0 +1,12 @@
CONFIG_TUP_ARCH=arm_v8
CONFIG_TOOL_CHAIN_PREFIX=genode-aarch64-
CONFIG_CC_WRAPPER=ccache
CONFIG_CXX_WRAPPER=ccache
CONFIG_OFFLINE=
CONFIG_NO_NETWORK=
CONFIG_SCULPT_VERSION=19.05
CONFIG_PUBLIC_USER=ehmry
CONFIG_PUBLIC_KEY=6E10414EE7160781F5FEE8FFB14D043A26B3D2C7

14
configs/i386.config Normal file
View File

@ -0,0 +1,14 @@
CONFIG_TUP_ARCH=x86_64
CONFIG_TOOL_CHAIN_PREFIX=genode-x86-
CONFIG_CC_WRAPPER=ccache
CONFIG_CXX_WRAPPER=ccache
CONFIG_OFFLINE=
CONFIG_NO_NETWORK=
CONFIG_BUILD_NOVA=y
CONFIG_SCULPT_VERSION=19.05
CONFIG_PUBLIC_USER=ehmry
CONFIG_PUBLIC_KEY=6E10414EE7160781F5FEE8FFB14D043A26B3D2C7

View File

@ -1,16 +1,14 @@
CONFIG_TUP_ARCH=x86_64
CONFIG_TOOL_CHAIN_PREFIX=genode-x86-
CONFIG_SCULPT_VERSION=19.05
CONFIG_PKG_CONFIG_PATH=/opt/genode/sdk-19.05/pkgconfig/x86_64
CONFIG_TOOLCHAIN_PATH=/opt/genode/toolchain-19.05/bin
CONFIG_CC_WRAPPER=ccache
CONFIG_CXX_WRAPPER=ccache
#CONFIG_NO_NETWORK=
CONFIG_SKIP_INCOMPATIBLE=
CONFIG_OFFLINE=
CONFIG_BUILD_NOVA=y
CONFIG_SCULPT_VERSION=19.05
CONFIG_PUBLIC_USER=ehmry
CONFIG_PUBLIC_KEY=6E10414EE7160781F5FEE8FFB14D043A26B3D2C7

View File

@ -33,6 +33,6 @@ PKG_DEPENDS += \
|> libretro.so
LINK_T = $(TUP_CWD)/link.T
DEFINES += -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565
DEFINES += -fPIC -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565
DEFINES += -DGIT_VERSION=\"$(GIT_VERSION)\"
NO_UNDEFINED = --no-undefined

View File

@ -84,7 +84,7 @@ endif
ifeq ($(TARGET_NAME),testgl_compute_shaders)
CORE_PKGS += mesa
CFLAGS += -Igl -DNDEBUG -fPIC -DHAVE_ZIP_DEFLATE
CFLAGS += -Igl -DNDEBUG -DHAVE_ZIP_DEFLATE
SOURCES_CXX += libretro/libretro.cpp
SOURCES_CXX += gl/*.cpp
SOURCES_CXX += app/boxes.cpp

View File

@ -20,6 +20,6 @@ PKG_DEPENDS += \
: runtime |> !collect_pkg_runtime |>
include &RAW_RULES)
include &(RAW_RULES)
endif

@ -1 +1 @@
Subproject commit b6422c3dcc20b30a652557dca97ccd8a73f3111e
Subproject commit c1cf7c9ad6d43a35b1f28f5f7ebe1472bf293585