Date: Tuesday, February 2, 2016 @ 22:30:15 Author: demize Revision: 160032
archrelease: copy trunk to community-x86_64 Added: io/repos/community-x86_64/PATCH-Fix-for-inlining-in-C11-mode.patch (from rev 160031, io/trunk/PATCH-Fix-for-inlining-in-C11-mode.patch) io/repos/community-x86_64/PKGBUILD (from rev 160031, io/trunk/PKGBUILD) Deleted: io/repos/community-x86_64/PKGBUILD ------------------------------------------+ PATCH-Fix-for-inlining-in-C11-mode.patch | 57 ++++++++++++++++++++++ PKGBUILD | 75 +++++++++++++++-------------- 2 files changed, 98 insertions(+), 34 deletions(-) Copied: io/repos/community-x86_64/PATCH-Fix-for-inlining-in-C11-mode.patch (from rev 160031, io/trunk/PATCH-Fix-for-inlining-in-C11-mode.patch) =================================================================== --- PATCH-Fix-for-inlining-in-C11-mode.patch (rev 0) +++ PATCH-Fix-for-inlining-in-C11-mode.patch 2016-02-02 21:30:15 UTC (rev 160032) @@ -0,0 +1,57 @@ +From 2ab9505240c7d32ea5cb4d367c86af0146ac0b7c Mon Sep 17 00:00:00 2001 +From: Peter Hull <peterhul...@gmail.com> +Date: Sun, 24 Jan 2016 13:19:27 +0000 +Subject: [PATCH] Fix for inlining in C11 mode + +--- + libs/basekit/source/Common_inline.h | 36 ++++++++++++++++++++++++------------ + 1 file changed, 24 insertions(+), 12 deletions(-) + +diff --git a/libs/basekit/source/Common_inline.h b/libs/basekit/source/Common_inline.h +index a4086d7..19f8d47 100755 +--- a/libs/basekit/source/Common_inline.h ++++ b/libs/basekit/source/Common_inline.h +@@ -117,19 +117,31 @@ Kudos to Daniel A. Koepke + #endif + + #elif defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) +- +- #ifdef IO_IN_C_FILE +- // in .c +- #define IO_DECLARE_INLINES +- #define IOINLINE inline +- #define IOINLINE_RECURSIVE inline ++ #ifdef __GNUC_STDC_INLINE__ ++ #ifdef IO_IN_C_FILE ++ // in .c ++ #define IO_DECLARE_INLINES ++ #define IOINLINE ++ #define IOINLINE_RECURSIVE ++ #else ++ // in .h ++ #define IO_DECLARE_INLINES ++ #define IOINLINE inline ++ #define IOINLINE_RECURSIVE inline ++ #endif + #else +- // in .h +- #define IO_DECLARE_INLINES +- #define IOINLINE extern inline +- #define IOINLINE_RECURSIVE extern inline +- #endif +- ++ #ifdef IO_IN_C_FILE ++ // in .c ++ #define IO_DECLARE_INLINES ++ #define IOINLINE inline ++ #define IOINLINE_RECURSIVE inline ++ #else ++ // in .h ++ #define IO_DECLARE_INLINES ++ #define IOINLINE extern inline ++ #define IOINLINE_RECURSIVE extern inline ++ #endif ++ #endif + #else + + #ifdef IO_IN_C_FILE Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-02-02 21:30:09 UTC (rev 160031) +++ PKGBUILD 2016-02-02 21:30:15 UTC (rev 160032) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Alexander Rødseth <rods...@gmail.com> -# Contributor: Gergely Imreh <imrehg(at)gmail(dot)com> - -pkgname=io -pkgver=2013.12.04 -pkgrel=2 -pkgdesc='IO programming language' -arch=('x86_64' 'i686') -url='http://iolanguage.com/' -license=('BSD') -depends=('pcre' 'libsndfile' 'libxmu' 'freetype2' 'libedit' 'libxml2' 'libtiff' 'libevent' 'yajl' 'libmysqlclient' 'lzo' 'libpng' 'python2' 'util-linux' 'freeglut' 'libjpeg-turbo' 'libtheora') -makedepends=('cmake') -source=("$pkgname-$pkgver.tar.gz::https://github.com/stevedekorte/io/tarball/$pkgver") -options=('!makeflags' '!buildflags') -sha256sums=('a5ca07b4d211995a0cd9442e1d752b2824444bee018c6db31899ddd6c5c87c4f') - -build() { - cd stevedekorte-io-* - sed -i "s:20110905:${pkgver//./}:" libs/iovm/source/IoVersion.h - mkdir -p build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make -} - -package() { - cd stevedekorte-io-* - make -C build DESTDIR="$pkgdir" install - install -Dm644 license/bsd_license.txt \ - "$pkgdir/usr/share/licenses/$pkgname/bsd_license.txt" -} - -# vim:set ts=2 sw=2 et: Copied: io/repos/community-x86_64/PKGBUILD (from rev 160031, io/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-02-02 21:30:15 UTC (rev 160032) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Gergely Imreh <imrehg(at)gmail(dot)com> + +pkgname=io +pkgver=2015.11.11 +pkgrel=1 +pkgdesc='IO programming language' +arch=('x86_64' 'i686') +url='http://iolanguage.com/' +license=('BSD') +depends=('pcre' 'libsndfile' 'libxmu' 'freetype2' 'libedit' 'libxml2' 'libtiff' 'libevent' 'yajl' 'libmysqlclient' 'lzo' 'libpng' 'python2' 'util-linux' 'freeglut' 'libjpeg-turbo' 'libtheora') +makedepends=('cmake' 'git') +options=('!makeflags' '!buildflags') +source=("git://github.com/stevedekorte/io#tag=$pkgver" + PATCH-Fix-for-inlining-in-C11-mode.patch) +md5sums=('SKIP' + 'a3bab046cbc4be88ec95bb22c28abab3') + +prepare() { + cd io + git am ../PATCH-Fix-for-inlining-in-C11-mode.patch +} + +build() { + cd io + sed -i "s:20140919:${pkgver//./}:" libs/iovm/source/IoVersion.h + mkdir -p build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make # Does not build with ninja +} + +package() { + cd io + make -C build DESTDIR="$pkgdir" install + install -Dm644 license/bsd_license.txt \ + "$pkgdir/usr/share/licenses/$pkgname/bsd_license.txt" +} + +# vim:set ts=2 sw=2 et: