libreoffice: fix stack protector detection

This commit is contained in:
Kacper Kasper
2018-07-31 01:22:39 +02:00
parent 4b39739838
commit 87139540d7
2 changed files with 36 additions and 11 deletions

View File

@@ -17,7 +17,7 @@ and Open Source office suite on the market:
HOMEPAGE="https://www.libreoffice.org/"
COPYRIGHT="2000-2018 LibreOffice contributors"
LICENSE="MPL v2.0"
REVISION="10"
REVISION="11"
COMMIT="1c56d5fec2ddd9f68aaaf21e9dbe287db893c092"
SOURCE_URI="https://github.com/LibreOffice/core/archive/$COMMIT.tar.gz"
CHECKSUM_SHA256="8ead56edb57384bf6f18331566a6d52a04d97bfd9e52e139925b8f6224d84b20"
@@ -108,7 +108,6 @@ REQUIRES="
lib:libsmime3$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libssl3$secondaryArchSuffix
lib:libssp$secondaryArchSuffix
lib:libstaroffice_0.0$secondaryArchSuffix
lib:libvisio_0.1$secondaryArchSuffix
lib:libwpd_0.10$secondaryArchSuffix
@@ -172,7 +171,7 @@ BUILD_REQUIRES="
devel:liborcus_0.13$secondaryArchSuffix
devel:libpagemaker_0.0$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix
devel:libpthread_stubs$secondaryArchSuffix
devel:libpthread_stubs
devel:libqxp_0.0$secondaryArchSuffix
devel:libraptor2$secondaryArchSuffix
devel:librdf$secondaryArchSuffix
@@ -212,7 +211,7 @@ BUILD_PREREQUIRES="
cmd:make
cmd:patch
cmd:perl
cmd:pkg_config$secondaryArchSuffix
cmd:pkg_config
cmd:python2.7
cmd:python3.6
cmd:which
@@ -227,8 +226,10 @@ BUILD()
cd .. ; mv $sourceDir core
ln -s core core-$COMMIT; cd core
export CFLAGS="-fno-stack-protector"
export CXXFLAGS="-fno-stack-protector"
pkgconfig_libdir="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
pkgconfig_datadir="`finddir B_SYSTEM_DIRECTORY`/$relativeDataDir/pkgconfig"
export PKG_CONFIG_LIBDIR="$pkgconfig_libdir:$pkgconfig_datadir"
runConfigure ./autogen.sh \
--with-distro=LibreOfficeHaiku \
--enable-kde5 \