diff options
| author | David Spencer <baildon.research@googlemail.com> | 2015-12-13 20:59:39 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | ad751bb65cea33ebdd7f1b61dc0f6cf6eb2603b4 (patch) | |
| tree | 2568671eac0c432549d59b837950794fc2e3e2cc | |
| parent | b2cd7af725d15f5bc64f244341d7ff816efd6eed (diff) | |
| download | slackbuilds-ad751bb65cea33ebdd7f1b61dc0f6cf6eb2603b4.tar.gz | |
development/avarice: Fixed build with gcc-5.2.0.
SlackBuild script cleanup.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | development/avarice/avarice.SlackBuild | 19 | ||||
| -rw-r--r-- | development/avarice/bug-777789-gcc-5.patch | 23 |
2 files changed, 36 insertions, 6 deletions
diff --git a/development/avarice/avarice.SlackBuild b/development/avarice/avarice.SlackBuild index 1a269a408c..3346fc77cc 100644 --- a/development/avarice/avarice.SlackBuild +++ b/development/avarice/avarice.SlackBuild @@ -40,10 +40,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf avarice-$VERSION avarice-build-$VERSION -tar xvf $CWD/avarice-$VERSION.tar.bz2 -mkdir avarice-build-$VERSION -cd avarice-build-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -51,9 +50,17 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix for gcc-5.2.0 (-current) +# http://anonscm.debian.org/cgit/collab-maint/avarice.git/plain/debian/patches/bug-777789-gcc-5.patch?id=f8686dbd02cc6710e36f31ab118a46ed0adc758c +patch -p1 < $CWD/bug-777789-gcc-5.patch + +rm -rf $TMP/$PRGNAM-build-$VERSION +mkdir $TMP/$PRGNAM-build-$VERSION +cd $TMP/$PRGNAM-build-$VERSION + CFLAGS_FOR_BUILD="$SLKCFLAGS" \ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \ -../avarice-$VERSION/configure \ +../$PRGNAM-$VERSION/configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ @@ -74,7 +81,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION for file in COPYING* ChangeLog AUTHORS INSTALL NEWS; do - cp ../avarice-$VERSION/$file $PKG/usr/doc/$PRGNAM-$VERSION + cp ../$PRGNAM-$VERSION/$file $PKG/usr/doc/$PRGNAM-$VERSION done cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/avarice/bug-777789-gcc-5.patch b/development/avarice/bug-777789-gcc-5.patch new file mode 100644 index 0000000000..a4e385e3f9 --- /dev/null +++ b/development/avarice/bug-777789-gcc-5.patch @@ -0,0 +1,23 @@ +Description: Fix FTBFS for GCC 5 +Author: Tobias Frost <tobi@debian.org> +Bug: https://sourceforge.net/p/avarice/patches/34/ +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777789 +Last-Update: 2015-05-18 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/pragma.h ++++ b/src/pragma.h +@@ -28,9 +28,10 @@ + */ + #if defined(__GNUC__) + # if __GNUC__ > 4 +-# define PRAGMA_DIAG_PUSH _Pragma(GCC diagnostic push) +-# define PRAGMA_DIAG_POP _Pragma(GCC diagnostic pop) +-# define PRAGMA_DIAG_IGNORED(x) _Pragma(GCC diagnostic ignored x) ++# define PRAGMA_DIAG_PUSH _Pragma("GCC diagnostic push") ++# define PRAGMA_DIAG_POP _Pragma("GCC diagnostic pop") ++# define PRAGMA_(x) _Pragma(#x) ++# define PRAGMA_DIAG_IGNORED(x) PRAGMA_(GCC diagnostic ignored x) + # elif __GNUC__ == 4 + # if __GNUC_MINOR__ >= 6 + # define PRAGMA_DIAG_PUSH _Pragma("GCC diagnostic push") |