From dd1c30854880899c7819b26607a703c7a81c9597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= Date: Wed, 11 Sep 2019 19:47:02 +0200 Subject: [PATCH] Revert "Use remote part's implementation of ccache" This reverts commit 4383a929d6c4b02b0fbf9e758e906de9a15251a9. Reason for reversal: https://github.com/Lin-Buo-Ren/ccache-part/issues/2 --- snap/snapcraft.yaml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 404b5b184a..02f58e1242 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -361,6 +361,40 @@ parts: ccache: after: - gcc-6 + override-pull: 'true' + build-packages: + - ccache + plugin: nil + override-build: | + mkdir \ + --parents \ + "${SNAPCRAFT_PART_INSTALL}"/bin + ln \ + --force \ + --symbolic \ + "$(which ccache)" \ + "${SNAPCRAFT_PART_INSTALL}"/bin/gcc-6 + ln \ + --force \ + --symbolic \ + "$(which ccache)" \ + "${SNAPCRAFT_PART_INSTALL}"/bin/g++-6 + ln \ + --force \ + --symbolic \ + ./gcc-6 \ + "${SNAPCRAFT_PART_INSTALL}"/bin/gcc + ln \ + --force \ + --symbolic \ + ./g++-6 \ + "${SNAPCRAFT_PART_INSTALL}"/bin/g++ + filesets: + executables: + - bin/* + stage: + - $executables + override-prime: 'true' # This pseudo part setups version 6 of GCC, which is not available # in Ubuntu 16.04 software source.