From 76b1469b1636f47b01e35bb4674fec31470fac75 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sun, 19 May 2019 18:27:26 -0400 Subject: build: Replace mkdir/mv commands with $(inst) func This allows installation commands to be shorter and should fix: # C++ headers: mkdir -p \ dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/gcc/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//') \ dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/gcc/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//')/fixed \ dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//') \ dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//') \ dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//')/backward mv dest-amd64-linux-glibc/usr/lib/amd64-linux-glibc/gcc/$(oh-architecture amd64-linux-glibc)/$(printf '%s\n' '8.3.0+sip1' | sed 's/+sip.*//')/include/* \ dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/gcc/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//') mv dest-amd64-linux-glibc/usr/lib/amd64-linux-glibc/gcc/$(oh-architecture amd64-linux-glibc)/$(printf '%s\n' '8.3.0+sip1' | sed 's/+sip.*//')/include-fixed/* \ dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/gcc/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//')/fixed # def_gcc_gxx_tool_include_dir and def_gcc_gxx_backward_include_dir are # subdirectories of def_gcc_gxx_include_dir, so move them first. mv dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' '8.3.0+sip1' | sed 's/+sip.*//')/$(oh-architecture amd64-linux-glibc)/* \ dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//') mv dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' '8.3.0+sip1' | sed 's/+sip.*//')/backward/* \ dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//')/backward mv dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' '8.3.0+sip1' | sed 's/+sip.*//')/* \ dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//') mv: can't rename 'dest-amd64-linux-glibc/usr/include/c++/8.3.0/backward': Directory not empty ../build:150: recipe for target 'install-native' failed make[1]: *** [install-native] Error 1 make[1]: Leaving directory '/prokit/sessions/445794320/wd/tmp' ../build:308: recipe for target 'install' failed make: *** [install] Error 2 --- (limited to 'gcc-8-dev.pkg/control') -- cgit v0.9.1