wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Ice: fix build w/ gcc-8.2.0

Browse source 
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2018-09-24 13:03:15 +02:00
parent 81e691be83
commit a889615e8e
No known key found for this signature in database
GPG key ID: 6764EC32352D0647
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
srcpkgs/Ice/template
View file

@ -16,10 +16,6 @@ case "$XBPS_TARGET_MACHINE" in
aarch64*) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/739/steps/shell_3/logs/stdio";; aarch64*) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/739/steps/shell_3/logs/stdio";;
esac esac
if [ "$XBPS_GCC_VERSION_MAJOR" -ge 8 ]; then
CXXFLAGS+=" -Wno-catch-value"
fi
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
# Cross build requires the host's slice2cpp and slice2freeze # Cross build requires the host's slice2cpp and slice2freeze
hostmakedepends+=" Ice" hostmakedepends+=" Ice"
@ -43,7 +39,8 @@ do_configure() {
-e "s|ifeq (\$(CXX),g++)|ifeq (\$(CXX),${CXX})|" \ -e "s|ifeq (\$(CXX),g++)|ifeq (\$(CXX),${CXX})|" \
-e "/CXXARCHFLAGS\s+=/ s| -m.*|${CXXFLAGS}|" \ -e "/CXXARCHFLAGS\s+=/ s| -m.*|${CXXFLAGS}|" \
-e "s|\$(CXX) -shared|${CXX} -shared|" \ -e "s|\$(CXX) -shared|${CXX} -shared|" \
-e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" -e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" \
-e "s|-Werror|-Wno-error|"
# Fix cross building # Fix cross building
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
# Use host's slice2cpp and slice2freeze # Use host's slice2cpp and slice2freeze