Fix cps and mingw

master
Marko Semet 2019-11-26 22:42:33 +01:00
parent b577c3f061
commit 1c6a0de4f6
10 changed files with 32 additions and 28 deletions

View File

@ -36,6 +36,10 @@ modules:
- "i386" - "i386"
- platform/platform.yaml - platform/platform.yaml
- sdk/sdk.yaml - sdk/sdk.yaml
- name: finalize
buildsystem: simple
build-commands:
- libtool --finish /usr/lib /usr/lib/i386-linux-gnu
cleanup: cleanup:
- /lib/debug - /lib/debug

View File

@ -37,6 +37,10 @@ modules:
- x86_64 - x86_64
- platform/platform.yaml - platform/platform.yaml
- sdk/sdk.yaml - sdk/sdk.yaml
- name: finalize
buildsystem: simple
build-commands:
- libtool --finish /usr/lib /usr/lib/x86_64-linux-gnu /usr/lib32
cleanup: cleanup:
- /lib/debug - /lib/debug

View File

@ -13,7 +13,7 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_faudio/usr/share - rm -rfv /usr/tmp_faudio/usr/share
- cp -rav /usr/tmp_faudio/usr / - cp -ravP --remove-destination /usr/tmp_faudio/usr /
- rm -rfv /usr/tmp_faudio - rm -rfv /usr/tmp_faudio
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"
@ -36,7 +36,7 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_faudio/usr/share /usr/tmp_faudio/usr/include - rm -rfv /usr/tmp_faudio/usr/share /usr/tmp_faudio/usr/include
- cp -rav /usr/tmp_faudio/usr / - cp -ravP --remove-destination /usr/tmp_faudio/usr /
- rm -rfv /usr/tmp_faudio - rm -rfv /usr/tmp_faudio
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"
@ -72,5 +72,5 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_sdl2/usr/share /usr/tmp_sdl2/usr/bin /usr/tmp_sdl2/usr/include - rm -rfv /usr/tmp_sdl2/usr/share /usr/tmp_sdl2/usr/bin /usr/tmp_sdl2/usr/include
- cp -rav /usr/tmp_sdl2/usr / - cp -ravP --remove-destination /usr/tmp_sdl2/usr /
- rm -rfv /usr/tmp_sdl2 - rm -rfv /usr/tmp_sdl2

View File

@ -12,7 +12,7 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_glu/usr/share - rm -rfv /usr/tmp_glu/usr/share
- cp -rav /usr/tmp_glu/usr / - cp -ravP --remove-destination /usr/tmp_glu/usr /
- rm -rfv /usr/tmp_glu - rm -rfv /usr/tmp_glu
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"
@ -36,7 +36,7 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_glu/usr/share - rm -rfv /usr/tmp_glu/usr/share
- cp -rav /usr/tmp_glu/usr / - cp -ravP --remove-destination /usr/tmp_glu/usr /
- rm -rfv /usr/tmp_glu - rm -rfv /usr/tmp_glu
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"

View File

@ -17,7 +17,7 @@ modules:
- rm -rfv /usr/tmp_ldap/usr/share - rm -rfv /usr/tmp_ldap/usr/share
- mv -v /usr/tmp_ldap/usr/sbin/* /usr/tmp_ldap/usr/bin - mv -v /usr/tmp_ldap/usr/sbin/* /usr/tmp_ldap/usr/bin
- rm -rfv /usr/tmp_ldap/usr/sbin - rm -rfv /usr/tmp_ldap/usr/sbin
- cp -rav /usr/tmp_ldap/usr / - cp -ravP --remove-destination /usr/tmp_ldap/usr /
- rm -rfv /usr/tmp_ldap - rm -rfv /usr/tmp_ldap
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"
@ -43,7 +43,7 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_ldap/usr/share /usr/tmp_ldap/usr/sbin /usr/tmp_ldap/usr/bin /usr/tmp_ldap/usr/include - rm -rfv /usr/tmp_ldap/usr/share /usr/tmp_ldap/usr/sbin /usr/tmp_ldap/usr/bin /usr/tmp_ldap/usr/include
- cp -rav /usr/tmp_ldap/usr / - cp -ravP --remove-destination /usr/tmp_ldap/usr /
- rm -rfv /usr/tmp_ldap - rm -rfv /usr/tmp_ldap
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"

View File

@ -12,7 +12,7 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_pcap/usr/share - rm -rfv /usr/tmp_pcap/usr/share
- cp -rav /usr/tmp_pcap/usr / - cp -ravP --remove-destination /usr/tmp_pcap/usr /
- rm -rfv /usr/tmp_pcap - rm -rfv /usr/tmp_pcap
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"
@ -36,7 +36,7 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_pcap/usr/share - rm -rfv /usr/tmp_pcap/usr/share
- cp -rav /usr/tmp_pcap/usr / - cp -ravP --remove-destination /usr/tmp_pcap/usr /
- rm -rfv /usr/tmp_pcap - rm -rfv /usr/tmp_pcap
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"

View File

@ -21,7 +21,7 @@ modules:
post-install: post-install:
- rm -rfv /usr/tmp_udev/usr/share - rm -rfv /usr/tmp_udev/usr/share
- mv /usr/tmp_udev/usr/sbin /usr/tmp_udev/usr/bin - mv /usr/tmp_udev/usr/sbin /usr/tmp_udev/usr/bin
- cp -rav /usr/tmp_udev/usr / - cp -ravP --remove-destination /usr/tmp_udev/usr /
- rm -rfv /usr/tmp_udev - rm -rfv /usr/tmp_udev
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"
@ -51,7 +51,7 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_udev/usr/share /usr/tmp_udev/usr/sbin /usr/tmp_udev/usr/libexec - rm -rfv /usr/tmp_udev/usr/share /usr/tmp_udev/usr/sbin /usr/tmp_udev/usr/libexec
- cp -rav /usr/tmp_udev/usr / - cp -ravP --remove-destination /usr/tmp_udev/usr /
- rm -rfv /usr/tmp_udev - rm -rfv /usr/tmp_udev
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"

View File

@ -13,7 +13,7 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_spirv/usr/share - rm -rfv /usr/tmp_spirv/usr/share
- cp -rav /usr/tmp_spirv/usr / - cp -ravP --remove-destination /usr/tmp_spirv/usr /
- rm -rfv /usr/tmp_spirv - rm -rfv /usr/tmp_spirv
cleanup-platform: cleanup-platform:
- "/include" - "/include"
@ -29,7 +29,7 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_vkd3d/usr/share - rm -rfv /usr/tmp_vkd3d/usr/share
- cp -rav /usr/tmp_vkd3d/usr / - cp -ravP --remove-destination /usr/tmp_vkd3d/usr /
- rm -rfv /usr/tmp_vkd3d - rm -rfv /usr/tmp_vkd3d
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"
@ -53,7 +53,7 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_vkd3d/usr/share - rm -rfv /usr/tmp_vkd3d/usr/share
- cp -rav /usr/tmp_vkd3d/usr / - cp -ravP --remove-destination /usr/tmp_vkd3d/usr /
- rm -rfv /usr/tmp_vkd3d - rm -rfv /usr/tmp_vkd3d
cleanup-platform: cleanup-platform:
- "*.la" - "*.la"

View File

@ -10,7 +10,7 @@ build-options:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_winetricks/usr/share - rm -rfv /usr/tmp_winetricks/usr/share
- cp -rfv /usr/tmp_winetricks/usr/* /usr - cp -ravP --remove-destination /usr/tmp_winetricks/usr/* /usr
- rm -rf /usr/tmp_winetricks - rm -rf /usr/tmp_winetricks
modules: modules:
@ -25,5 +25,5 @@ modules:
- install - install
post-install: post-install:
- rm -rfv /usr/tmp_cabextract/usr/share - rm -rfv /usr/tmp_cabextract/usr/share
- cp -rfv /usr/tmp_cabextract/usr/* /usr - cp -ravP --remove-destination /usr/tmp_cabextract/usr/* /usr
- rm -rf /usr/tmp_cabextract - rm -rf /usr/tmp_cabextract

View File

@ -24,7 +24,7 @@ modules:
- install - install
post-install: post-install:
- rm -rf /usr/tmp_binutils/usr/share - rm -rf /usr/tmp_binutils/usr/share
- cp -rf /usr/tmp_binutils/usr / - cp -raP --remove-destination /usr/tmp_binutils/usr /
- rm -rfv /usr/tmp_binutils - rm -rfv /usr/tmp_binutils
cleanup-platform: cleanup-platform:
- "*" - "*"
@ -47,7 +47,7 @@ modules:
- echo "" > /usr/tmp_mingw/usr/i686-w64-mingw32/include/pthread_unistd.h - echo "" > /usr/tmp_mingw/usr/i686-w64-mingw32/include/pthread_unistd.h
post-install: post-install:
- rm -rf /usr/tmp_mingw/usr/share - rm -rf /usr/tmp_mingw/usr/share
- cp -rf /usr/tmp_mingw/usr / - cp -rP --remove-destination /usr/tmp_mingw/usr /
- rm -rfv /usr/tmp_mingw - rm -rfv /usr/tmp_mingw
cleanup-platform: cleanup-platform:
- "*" - "*"
@ -83,12 +83,10 @@ modules:
- --enable-default-pie - --enable-default-pie
- --enable-fully-dynamic-string - --enable-fully-dynamic-string
- --enable-languages=c,lto,c++ - --enable-languages=c,lto,c++
- --enable-linker-build-id
- --enable-lto - --enable-lto
- --enable-plugin - --enable-plugin
- --enable-shared - --enable-shared
- --enable-static - --enable-static
- --enable-version-specific-runtime-libs
- --with-system-zlib - --with-system-zlib
builddir: true builddir: true
no-make-install: true no-make-install: true
@ -98,7 +96,7 @@ modules:
post-install: post-install:
- make DESTDIR=/usr/tmp_gcc install-gcc - make DESTDIR=/usr/tmp_gcc install-gcc
- rm -rf /usr/tmp_gcc/usr/share - rm -rf /usr/tmp_gcc/usr/share
- cp -rf /usr/tmp_gcc/usr / - cp -raP --remove-destination /usr/tmp_gcc/usr /
- rm -rfv /usr/tmp_gcc /lib/cpp - rm -rfv /usr/tmp_gcc /lib/cpp
cleanup-platform: cleanup-platform:
- "*" - "*"
@ -126,7 +124,7 @@ modules:
- install - install
post-install: post-install:
- rm -rf /usr/tmp_mingw/usr/share - rm -rf /usr/tmp_mingw/usr/share
- cp -rf /usr/tmp_mingw/usr / - cp -raP --remove-destination /usr/tmp_mingw/usr /
- rm -rfv /usr/tmp_mingw - rm -rfv /usr/tmp_mingw
cleanup-platform: cleanup-platform:
- "*" - "*"
@ -188,7 +186,7 @@ modules:
- install - install
post-install: post-install:
- rm -rf /usr/tmp_binutils/usr/share - rm -rf /usr/tmp_binutils/usr/share
- cp -rf /usr/tmp_binutils/usr / - cp -raP --remove-destination /usr/tmp_binutils/usr /
- rm -rfv /usr/tmp_binutils - rm -rfv /usr/tmp_binutils
cleanup-platform: cleanup-platform:
- "*" - "*"
@ -210,7 +208,7 @@ modules:
- cd builds && make DESTDIR=/usr/tmp_mingw install - cd builds && make DESTDIR=/usr/tmp_mingw install
post-install: post-install:
- rm -rf /usr/tmp_mingw/usr/share - rm -rf /usr/tmp_mingw/usr/share
- cp -rf /usr/tmp_mingw/usr / - cp -raP --remove-destination /usr/tmp_mingw/usr /
- rm -rfv /usr/tmp_mingw - rm -rfv /usr/tmp_mingw
cleanup-platform: cleanup-platform:
- "*" - "*"
@ -248,12 +246,10 @@ modules:
- --enable-default-pie - --enable-default-pie
- --enable-fully-dynamic-string - --enable-fully-dynamic-string
- --enable-languages=c,lto,c++ - --enable-languages=c,lto,c++
- --enable-linker-build-id
- --enable-lto - --enable-lto
- --enable-plugin - --enable-plugin
- --enable-shared - --enable-shared
- --enable-static - --enable-static
- --enable-version-specific-runtime-libs
- --with-system-zlib - --with-system-zlib
builddir: true builddir: true
no-make-install: true no-make-install: true
@ -263,7 +259,7 @@ modules:
post-install: post-install:
- make DESTDIR=/usr/tmp_gcc install-gcc - make DESTDIR=/usr/tmp_gcc install-gcc
- rm -rf /usr/tmp_gcc/usr/share - rm -rf /usr/tmp_gcc/usr/share
- cp -rf /usr/tmp_gcc/usr / - cp -raP --remove-destination /usr/tmp_gcc/usr /
- rm -rfv /usr/tmp_gcc /lib/cpp - rm -rfv /usr/tmp_gcc /lib/cpp
cleanup-platform: cleanup-platform:
- "*" - "*"
@ -330,7 +326,7 @@ modules:
- install - install
post-install: post-install:
- rm -rf /usr/tmp_gcc/usr/share - rm -rf /usr/tmp_gcc/usr/share
- cp -rf /usr/tmp_gcc/usr / - cp -raP --remove-destination /usr/tmp_gcc/usr /
- rm -rfv /usr/tmp_gcc /lib/cpp - rm -rfv /usr/tmp_gcc /lib/cpp
cleanup-platform: cleanup-platform:
- "*" - "*"