diff options
| author |   Matteo Bernardini <ponce@slackbuilds.org> | 2012-09-19 20:53:52 +0200 |
|---|---|---|
| committer |   Robby Workman <rworkman@slackbuilds.org> | 2012-09-19 20:30:01 -0500 |
| commit | 36f315e25c3a563664086e31108140bfc90625ce (patch) | |
| tree | 708cd4db70b96a11b156d776398c4cb7e0608797 /misc/merkaartor/merkaartor.SlackBuild | |
| parent | 20d12c382cdbc0b18b99cb819b456fadb32fd13e (diff) | |
| download | slackbuilds-36f315e25c3a563664086e31108140bfc90625ce.tar.gz slackbuilds-36f315e25c3a563664086e31108140bfc90625ce.tar.xz | |
misc/merkaartor: Added a patch for gcc-4.7.x.
Also a -fpermissive to the CXXFLAGS
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'misc/merkaartor/merkaartor.SlackBuild')
| -rw-r--r-- | misc/merkaartor/merkaartor.SlackBuild | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/misc/merkaartor/merkaartor.SlackBuild b/misc/merkaartor/merkaartor.SlackBuild index 98775f537b..a4289ecd62 100644 --- a/misc/merkaartor/merkaartor.SlackBuild +++ b/misc/merkaartor/merkaartor.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=merkaartor VERSION=${VERSION:-0.17.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,11 +51,14 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Build fix for gcc-4.7.x +patch -p1 < $CWD/gcc47.patch + make -C translations release qmake \ QMAKE_CFLAGS="$SLKCFLAGS" \ - QMAKE_CXXFLAGS="$SLKCFLAGS" \ + QMAKE_CXXFLAGS="$SLKCFLAGS -fpermissive" \ NODEBUG=1 \ PREFIX=/usr \ DOCDIR=/usr/doc/$PRGNAM-$VERSION \ |