From 487207e1506214ef889c433156c0346300ae656f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 4 Jul 2019 10:03:24 +0200 Subject: [PATCH] Remove dead SDK references --- default.nix | 6 +--- sdk/Tuprules.tup | 66 ------------------------------------ sdk/abi.tup | 31 ----------------- sdk/cmake/Toolchain.cmake.in | 17 ---------- sdk/default.nix | 40 ---------------------- sdk/repos/base/Tuprules.tup | 1 - sdk/repos/gems/Tuprules.tup | 1 - sdk/repos/os/Tuprules.tup | 1 - sdk/sdk.nix | 42 ----------------------- sdk/tar.tup | 1 - sdk/template.pc.in | 1 - sdk/template.pc.tup | 13 ------- 12 files changed, 1 insertion(+), 219 deletions(-) delete mode 100644 sdk/Tuprules.tup delete mode 100644 sdk/abi.tup delete mode 100644 sdk/cmake/Toolchain.cmake.in delete mode 100644 sdk/default.nix delete mode 100644 sdk/repos/base/Tuprules.tup delete mode 100644 sdk/repos/gems/Tuprules.tup delete mode 100644 sdk/repos/os/Tuprules.tup delete mode 100644 sdk/sdk.nix delete mode 100644 sdk/tar.tup delete mode 100644 sdk/template.pc.in delete mode 100644 sdk/template.pc.tup diff --git a/default.nix b/default.nix index 594d55c38..3688aa66c 100644 --- a/default.nix +++ b/default.nix @@ -3,8 +3,6 @@ let lddir = ./upstream/repos/base/src/ld; toolchain = import ./errata/toolchain.nix { inherit pkgs; }; - sdk = import ./sdk { inherit pkgs toolchain; }; - ports = import ./upstream/repos/libports/ports { }; in pkgs.mkShell { name = "genode-dev-env"; @@ -45,13 +43,11 @@ pkgs.mkShell { ncurses ]; - passthru = { inherit lddir sdk toolchain; }; + passthru = { inherit lddir toolchain; }; shellHook = '' - export SDK_DIR=${sdk} export LD_DIR=${lddir} - export PKG_CONFIG_PATH=${sdk}/pkg-config export TOOLCHAIN_DIR=${toolchain} export SYSLINUX=${syslinux} export PROMPT_DIRTRIM=2 diff --git a/sdk/Tuprules.tup b/sdk/Tuprules.tup deleted file mode 100644 index 71052e0b6..000000000 --- a/sdk/Tuprules.tup +++ /dev/null @@ -1,66 +0,0 @@ -.gitignore -GENODE_DIR = $(TUP_CWD) -BASE_DIR = $(GENODE_DIR)/repos/base - -SDK_VERSION = 19.05 - # TODO: these are configuration settings - -LOCAL_LIB_PREFIX = lib -LOCAL_PKGCONFIG_PREFIX = pkgconfig - -SDK_PREFIX = /opt/genode/sdk-$(SDK_VERSION) -SDK_INCLUDE_PREFIX = $(SDK_PREFIX)/include -SDK_LIB_PREFIX = $(SDK_PREFIX)/$(LOCAL_LIB_PREFIX) -SDK_PKGCONFIG_PREFIX = $(SDK_PREFIX)/$(LOCAL_PKGCONFIG_PREFIX) - -SDK_DIR = $(GENODE_DIR)/sdk - -!ln = |> ^ LN %o -> %f^ ln -s %f %o |> -!cp = |> ^ CP %o^ cp %f %o |> - -!tar = |> tar cf %o %f $(TAR_FLAGS) |> - -SED_PKGCONFIG_FLAGS += -e 's|@exec_prefix@|$(SDK_PREFIX)|' -SED_PKGCONFIG_FLAGS += -e 's|@includedir@|$(SDK_INCLUDE_PREFIX)|' -SED_PKGCONFIG_FLAGS += -e 's|@prefix@|$(SDK_PREFIX)|' -SED_PKGCONFIG_FLAGS += -e 's|@sharedlibdir@|@libdir@|' -SED_PKGCONFIG_FLAGS += -e 's|@SDK_VERSION@|$(SDK_VERSION)|' - -SED_FLAGS_arm64 += -e 's|@libdir@|$(SDK_LIB_PREFIX)/arm64|' -SED_FLAGS_i386 += -e 's|@libdir@|$(SDK_LIB_PREFIX)/x86_32|' -SED_FLAGS_x86_64 += -e 's|@libdir@|$(SDK_LIB_PREFIX)/x86_64|' - -!sed_pkgconfig_file = |> ^ SED %B^ \ - sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_arm64) %f \ - > $(LOCAL_PKGCONFIG_PREFIX)/arm64/%B; \ - sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_i386) %f \ - > $(LOCAL_PKGCONFIG_PREFIX)/x86_32/%B; \ - sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_x86_64) %f \ - > $(LOCAL_PKGCONFIG_PREFIX)/x86_64/%B; \ -|> $(LOCAL_PKGCONFIG_PREFIX)/arm64/%B \ - $(LOCAL_PKGCONFIG_PREFIX)/x86_32/%B \ - $(LOCAL_PKGCONFIG_PREFIX)/x86_64/%B \ - - -!sed_pkgconfig_flags = |> ^ SED %d.pc^ \ - sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_arm64) \ - > $(LOCAL_PKGCONFIG_PREFIX)/arm64/%d.pc; \ - sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_i386) \ - > $(LOCAL_PKGCONFIG_PREFIX)/x86_32/%d.pc; \ - sed $(SED_PKGCONFIG_FLAGS) $(SED_FLAGS) $(SED_FLAGS_x86_64) \ - > $(LOCAL_PKGCONFIG_PREFIX)/x86_64/%d.pc; \ -|> $(LOCAL_PKGCONFIG_PREFIX)/arm64/%d.pc \ - $(LOCAL_PKGCONFIG_PREFIX)/x86_32/%d.pc \ - $(LOCAL_PKGCONFIG_PREFIX)/x86_64/%d.pc \ - - -PORTS_CURRENT = $(GENODE_DIR)/tool/ports/current - -SDK_ABI_INCLUDE = $(TUP_CWD)/abi.tup -SDK_TAR_INCLUDE = $(TUP_CWD)/tar.tup -SDK_PKGCONFIG_TEMPLATE_INCLUDE = $(TUP_CWD)/template.pc.tup - -CC = genode-x86-gcc -CXX = genode-x86-g++ -AR = genode-x86-ar -LD = genode-x86-ld diff --git a/sdk/abi.tup b/sdk/abi.tup deleted file mode 100644 index 1fe6badd0..000000000 --- a/sdk/abi.tup +++ /dev/null @@ -1,31 +0,0 @@ -ifeq ($(SYMBOLS_DIR),) - SYMBOLS_DIR = $(REP_DIR)/lib/symbols -endif - -LD_SCRIPT_SO = $(BASE_DIR)/src/ld/genode_rel.ld - -: |> ^ CONVERT %o^ sed \ - -e "s/^\(\w\+\) D \(\w\+\)\$/.data; .global \1; .type \1,%%object; .size \1,\2; \1:/p" \ - -e "s/^\(\w\+\) V/.data; .weak \1; .type \1,%%object; \1:/p" \ - -e "s/^\(\w\+\) T/.text; .global \1; .type \1,%%function; \1:/p" \ - -e "s/^\(\w\+\) R \(\w\+\)\$/.section .rodata; .global \1; .type \1,%%object; .size \1,\2; \1:/p" \ - -e "s/^\(\w\+\) W/.text; .weak \1; .type \1,%%function; \1:/p" \ - -e "s/^\(\w\+\) B \(\w\+\)\$/.bss; .global \1; .type \1,%%object; .size \1,\2; \1:/p" \ - -e "s/^\(\w\+\) U/.text; .global \1; $(ASM_SYM_DEPENDENCY)/p" \ - $(SYMBOLS_DIR)/%d > %o |> $(LOCAL_LIB_PREFIX)/%d.symbols.s {asm} - -: {asm} |> ^ ASSEMBLE %o^ $(CC) -c %f -o %o \ - |> $(LOCAL_LIB_PREFIX)/%b.o {obj} - -!merge = |> ^ MERGE %o^ $(LD) \ - -o %o \ - -shared --eh-frame-hdr $(LD_OPT) \ - -T $(LD_SCRIPT_SO) \ - --whole-archive --start-group \ - $(LIB_SO_DEPS) %f \ - --end-group --no-whole-archive \ -|> - -: {obj} |> !merge |> $(LOCAL_LIB_PREFIX)/arm64/%d.lib.so -: {obj} |> !merge |> $(LOCAL_LIB_PREFIX)/x86_32/%d.lib.so -: {obj} |> !merge |> $(LOCAL_LIB_PREFIX)/x86_64/%d.lib.so diff --git a/sdk/cmake/Toolchain.cmake.in b/sdk/cmake/Toolchain.cmake.in deleted file mode 100644 index 582536375..000000000 --- a/sdk/cmake/Toolchain.cmake.in +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDE(CMakeForceCompiler) - -SET(CMAKE_SYSTEM_NAME Genode) -SET(CMAKE_SYSTEM_VERSION @SDK_VERSION@) - -SET(CMAKE_FORCE_C_COMPILER @COMPILER_PREFIX@gcc GNU) -SET(CMAKE_FORCE_CXX_COMPILER @COMPILER_PREFIX@g++ GNU) - -# where is the target environment -SET(CMAKE_FIND_ROOT_PATH @SDK_PREFIX@) -SET(CMAKE_PREFIX_PATH @SDK_PREFIX@/cmake) - -# search for programs in the build host directories -SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -# for libraries and headers in the target directories -SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/sdk/default.nix b/sdk/default.nix deleted file mode 100644 index 02acb5174..000000000 --- a/sdk/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ toolchain, pkgs ? import {} }: with pkgs; - -let - version = "19.05"; - tarball = fetchurl { - url = "https://github.com/genodelabs/genode/archive/19.05.tar.gz"; - sha256 = "1mr81885ysjff7plfvav6cr3lx5yhlcyq63q8c8bfvgi1fcarbww"; - }; -in -stdenv.mkDerivation { - name = "genode-sdk-${version}"; - inherit tarball version; - - phases = "mainPhase"; - - toolchain_dir = toolchain.out; - tool_prefix = "genode-x86-"; - - spec_includes="-I\${includedir}/spec/x86_64 -I\${includedir}/spec/x86 -I\${includedir}/spec/64bit"; - - mainPhase = '' - export includedir=$out/include - export libdir=$out/lib - pkg_config_dir=$out/pkg-config - mkdir -p $includedir $pkg_config_dir - - for i in ${./pkg-config}/*.pc; do - substituteAll "$i" "$out/pkg-config/`basename $i`" - done - - tar xfv ${tarball} \ - --transform='s|genode-${version}/repos/base/include|genode-base/|' \ - --transform='s|genode-${version}/repos/os/include|genode-os/|' \ - --transform='s|genode-${version}/repos/gems/include|genode-gems/|' \ - -C $includedir \ - genode-${version}/repos/base/include \ - genode-${version}/repos/os/include \ - genode-${version}/repos/gems/include \ - ''; -} diff --git a/sdk/repos/base/Tuprules.tup b/sdk/repos/base/Tuprules.tup deleted file mode 100644 index ba90ee9d6..000000000 --- a/sdk/repos/base/Tuprules.tup +++ /dev/null @@ -1 +0,0 @@ -REP_DIR = $(TUP_CWD) diff --git a/sdk/repos/gems/Tuprules.tup b/sdk/repos/gems/Tuprules.tup deleted file mode 100644 index ba90ee9d6..000000000 --- a/sdk/repos/gems/Tuprules.tup +++ /dev/null @@ -1 +0,0 @@ -REP_DIR = $(TUP_CWD) diff --git a/sdk/repos/os/Tuprules.tup b/sdk/repos/os/Tuprules.tup deleted file mode 100644 index ba90ee9d6..000000000 --- a/sdk/repos/os/Tuprules.tup +++ /dev/null @@ -1 +0,0 @@ -REP_DIR = $(TUP_CWD) diff --git a/sdk/sdk.nix b/sdk/sdk.nix deleted file mode 100644 index b70cd3945..000000000 --- a/sdk/sdk.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ pkgs ? import {} }: with pkgs; - -let - genodeVersion = "19.05"; - toolchain = import /opt/genode/errata/toolchain.nix { inherit pkgs; }; - upstream = fetchFromGitHub { - owner = "genodelabs"; - repo = "genode"; - rev = "19.05"; - sha256 = "01sgixyvsq5g7fd0nj9j67d9jma0bhlprwyjf21dql9hqn5k0ngf"; - }; -in -stdenv.mkDerivation { - name = "genode-sdk-${genodeVersion}"; - version = genodeVersion; - - toolchain_dir = toolchain.out; - - inherit upstream; - - src = fetchurl { - url = "https://github.com/ehmry/genode/releases/download/19.05-sdk/sdk.tar.xz"; - sha256 = "ab6f9c1856c535ed17960f66bf4fca0d82f49b7457ac21c2f22adb612d489aa9"; - }; - - phases = [ "mainPhase" ]; - - mainPhase = '' - dest=$out/opt/genode - mkdir -p $dest - - tar xf $src --strip-components=3 -C $dest - - for i in $dest/pkgconfig/*/*.pc; do - substituteInPlace "$i" \ - --replace /opt/genode/sdk-${genodeVersion} $dest \ - --replace @TOOLCHAIN_DIR@ $toolchain_dir \ - ; done - ''; -} - - diff --git a/sdk/tar.tup b/sdk/tar.tup deleted file mode 100644 index 2d7055da9..000000000 --- a/sdk/tar.tup +++ /dev/null @@ -1 +0,0 @@ -: |> ^ TAR %o^ tar cf %o --transform='s|^|$(SDK_PREFIX)/|' % $(TAR_FLAGS) |> %d.sdk.tar $(SDK_DIR)/ diff --git a/sdk/template.pc.in b/sdk/template.pc.in deleted file mode 100644 index de8b47987..000000000 --- a/sdk/template.pc.in +++ /dev/null @@ -1 +0,0 @@ -Libs: -l:%d.lib.so diff --git a/sdk/template.pc.tup b/sdk/template.pc.tup deleted file mode 100644 index 08d281e2a..000000000 --- a/sdk/template.pc.tup +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE_FILE = $(TUP_CWD)/template.pc.in - -: $(TEMPLATE_FILE) | $(LOCAL_LIB_PREFIX)/*.lib.so \ - |> ^ Generate %d^ sed 's|%%d|%d|' %f > %o \ - |> $(LOCAL_PKGCONFIG_PREFIX)/arm64/%d.pc - -: $(TEMPLATE_FILE) | $(LOCAL_LIB_PREFIX)/*.lib.so \ - |> ^ Generate %d^ sed 's|%%d|%d|' %f > %o \ - |> $(LOCAL_PKGCONFIG_PREFIX)/x86_32/%d.pc - -: $(TEMPLATE_FILE) | $(LOCAL_LIB_PREFIX)/*.lib.so \ - |> ^ Generate %d^ sed 's|%%d|%d|' %f > %o \ - |> $(LOCAL_PKGCONFIG_PREFIX)/x86_64/%d.pc