Fix mingw ssp linking problems

master
Marko Semet 2019-09-11 21:03:40 +02:00
parent 46cbda12f6
commit a1c457c2d9
1 changed files with 6 additions and 60 deletions

View File

@ -81,7 +81,6 @@ modules:
- --enable-cloog-backend=isl
- --enable-cet=auto
- --enable-default-pie
- --enable-default-ssp
- --enable-fully-dynamic-string
- --enable-languages=c,lto,c++
- --enable-linker-build-id
@ -103,7 +102,7 @@ modules:
- rm -rfv /usr/tmp_gcc /lib/cpp
cleanup-platform:
- "*"
- name: mingw-crt-pass1-32bit
- name: mingw-crt-32bit
sources:
- type: archive
url: https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v6.0.0.tar.bz2
@ -118,6 +117,8 @@ modules:
- --prefix=/usr/i686-w64-mingw32
- CFLAGS=-fno-stack-protector
- CPPFLAGS=-fno-stack-protector
#- LDFLAGS=-fstack-protector-strong
#- ARFLAGS=-fstack-protector-strong
builddir: true
build-options:
make-install-args:
@ -163,32 +164,6 @@ modules:
- rm -rfv /usr/tmp_gcc /lib/cpp
cleanup-platform:
- "*"
- name: mingw-crt-32bit
sources:
- type: archive
url: https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v6.0.0.tar.bz2
sha256: 805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0
config-opts:
- --host=i686-w64-mingw32
- --disable-lib64
- --enable-lib32
- --enable-shared
- --enable-static
- --enable-wildcard
- --prefix=/usr/i686-w64-mingw32
- CFLAGS=-fstack-protector
- CPPFLAGS=-fstack-protector
builddir: true
build-options:
make-install-args:
- DESTDIR=/usr/tmp_mingw
- install
post-install:
- rm -rf /usr/tmp_mingw/usr/share
- cp -rf /usr/tmp_mingw/usr /
- rm -rfv /usr/tmp_mingw
cleanup-platform:
- "*"
- name: mingw-binutils-64bit
sources:
- type: archive
@ -271,7 +246,6 @@ modules:
- --enable-cloog-backend=isl
- --enable-cet=auto
- --enable-default-pie
- --enable-default-ssp
- --enable-fully-dynamic-string
- --enable-languages=c,lto,c++
- --enable-linker-build-id
@ -295,7 +269,7 @@ modules:
- "*"
only-arches:
- x86_64
- name: mingw-crt-pass1-64bit
- name: mingw-crt-64bit
sources:
- type: archive
url: https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v6.0.0.tar.bz2
@ -310,6 +284,8 @@ modules:
- --prefix=/usr/x86_64-w64-mingw32
- CFLAGS=-fno-stack-protector
- CPPFLAGS=-fno-stack-protector
#- LDFLAGS=-fstack-protector-strong
#- ARFLAGS=-fstack-protector-strong
builddir: true
build-options:
make-install-args:
@ -360,33 +336,3 @@ modules:
- "*"
only-arches:
- x86_64
- name: mingw-crt-64bit
sources:
- type: archive
url: https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v6.0.0.tar.bz2
sha256: 805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0
config-opts:
- --host=x86_64-w64-mingw32
- --disable-lib32
- --disable-static
- --enable-lib64
- --enable-shared
- --enable-wildcard
- --prefix=/usr/x86_64-w64-mingw32
- CFLAGS=-fstack-protector
- CPPFLAGS=-fstack-protector
builddir: true
build-options:
make-install-args:
- DESTDIR=/usr/tmp_mingw
- install
env:
PATH: "/usr/tmp_gcc64/usr/bin:/usr/bin"
post-install:
- rm -rf /usr/tmp_mingw/usr/share
- cp -rf /usr/tmp_mingw/usr /
- rm -rfv /usr/tmp_mingw
cleanup-platform:
- "*"
only-arches:
- x86_64