From d05815b2e60c15fdbf6e1e61f4378d64de0605ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 28 Apr 2015 20:46:12 +0200 Subject: [PATCH] package/archlinux: updated compatibility PKGBUILDs to new rules. --- package/archlinux/PKGBUILD-gcc44 | 18 ++++++++++++------ package/archlinux/PKGBUILD-gcc45 | 18 ++++++++++++------ package/archlinux/PKGBUILD-gcc46 | 18 ++++++++++++------ 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/package/archlinux/PKGBUILD-gcc44 b/package/archlinux/PKGBUILD-gcc44 index 99074611e..8867dd2f2 100644 --- a/package/archlinux/PKGBUILD-gcc44 +++ b/package/archlinux/PKGBUILD-gcc44 @@ -11,17 +11,23 @@ makedepends=('cmake' 'ninja' 'gcc44') options=('!strip' 'staticlibs') provides=('magnum-git') +_rootdir=$startdir/../../ + build() { - if [ ! -d "$startdir/build-gcc44" ] ; then - mkdir "$startdir/build-gcc44" - cd "$startdir/build-gcc44" + # Disable flags unknown to GCC 4.7 + newcxxflags=$(echo $CXXFLAGS | sed s/-fstack-protector-strong.//g) + export CXXFLAGS="$newcxxflags" + + if [ ! -d "$_rootdir/build-gcc44" ] ; then + mkdir "$_rootdir/build-gcc44" + cd "$_rootdir/build-gcc44" cmake .. \ -DCMAKE_CXX_COMPILER=g++-4.4 \ -G Ninja fi - cd "$startdir/build-gcc44" + cd "$_rootdir/build-gcc44" cmake .. \ -DCMAKE_BUILD_TYPE=Debug \ @@ -46,11 +52,11 @@ build() { } check() { - cd "$startdir/build-gcc44" + cd "$_rootdir/build-gcc44" ctest --output-on-failure -j5 } package() { - cd "$startdir/build-gcc44" + cd "$_rootdir/build-gcc44" DESTDIR="$pkgdir/" ninja install } diff --git a/package/archlinux/PKGBUILD-gcc45 b/package/archlinux/PKGBUILD-gcc45 index a5ab0fa9c..bc17cd48a 100644 --- a/package/archlinux/PKGBUILD-gcc45 +++ b/package/archlinux/PKGBUILD-gcc45 @@ -11,17 +11,23 @@ makedepends=('cmake' 'ninja' 'gcc45') options=('!strip' 'staticlibs') provides=('magnum-git') +_rootdir=$startdir/../../ + build() { - if [ ! -d "$startdir/build-gcc45" ] ; then - mkdir "$startdir/build-gcc45" - cd "$startdir/build-gcc45" + # Disable flags unknown to GCC 4.7 + newcxxflags=$(echo $CXXFLAGS | sed s/-fstack-protector-strong.//g) + export CXXFLAGS="$newcxxflags" + + if [ ! -d "$_rootdir/build-gcc45" ] ; then + mkdir "$_rootdir/build-gcc45" + cd "$_rootdir/build-gcc45" cmake .. \ -DCMAKE_CXX_COMPILER=g++-4.5 \ -G Ninja fi - cd "$startdir/build-gcc45" + cd "$_rootdir/build-gcc45" cmake .. \ -DCMAKE_BUILD_TYPE=Debug \ @@ -46,11 +52,11 @@ build() { } check() { - cd "$startdir/build-gcc45" + cd "$_rootdir/build-gcc45" ctest --output-on-failure -j5 } package() { - cd "$startdir/build-gcc45" + cd "$_rootdir/build-gcc45" DESTDIR="$pkgdir/" ninja install } diff --git a/package/archlinux/PKGBUILD-gcc46 b/package/archlinux/PKGBUILD-gcc46 index a3a545de7..192781a55 100644 --- a/package/archlinux/PKGBUILD-gcc46 +++ b/package/archlinux/PKGBUILD-gcc46 @@ -11,17 +11,23 @@ makedepends=('cmake' 'ninja' 'gcc46') options=('!strip' 'staticlibs') provides=('magnum-git') +_rootdir=$startdir/../../ + build() { - if [ ! -d "$startdir/build-gcc46" ] ; then - mkdir "$startdir/build-gcc46" - cd "$startdir/build-gcc46" + # Disable flags unknown to GCC 4.7 + newcxxflags=$(echo $CXXFLAGS | sed s/-fstack-protector-strong.//g) + export CXXFLAGS="$newcxxflags" + + if [ ! -d "$_rootdir/build-gcc46" ] ; then + mkdir "$_rootdir/build-gcc46" + cd "$_rootdir/build-gcc46" cmake .. \ -DCMAKE_CXX_COMPILER=g++-4.6 \ -G Ninja fi - cd "$startdir/build-gcc46" + cd "$_rootdir/build-gcc46" cmake .. \ -DCMAKE_BUILD_TYPE=Debug \ @@ -46,11 +52,11 @@ build() { } check() { - cd "$startdir/build-gcc46" + cd "$_rootdir/build-gcc46" ctest --output-on-failure -j5 } package() { - cd "$startdir/build-gcc46" + cd "$_rootdir/build-gcc46" DESTDIR="$pkgdir/" ninja install }