diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-08-23 23:41:11 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-08-23 23:42:13 +0700 |
| commit | 3bfb0fc925efff5138349eea5301939813f0515f (patch) | |
| tree | 720616268a91ecceb602d655ef92407bd067cac0 /development/autogen | |
| parent | c1916c8b21c893da6e93245ec22af95574ab4c24 (diff) | |
development/autogen: Added patch to work with newer guile.
Thanks to Ponce and jstg at #slackware on freenode.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/autogen')
| -rw-r--r-- | development/autogen/autogen-mktplconfig.patch | 21 | ||||
| -rw-r--r-- | development/autogen/autogen.SlackBuild | 6 |
2 files changed, 26 insertions, 1 deletions
diff --git a/development/autogen/autogen-mktplconfig.patch b/development/autogen/autogen-mktplconfig.patch new file mode 100644 index 000000000000..491da6a4c974 --- /dev/null +++ b/development/autogen/autogen-mktplconfig.patch @@ -0,0 +1,21 @@ +Author: Tigro <ashejn@gmail.com> + +Fix mk-tpl-config.sh to not fail when guile headers don't use noreturn + +https://abf.rosalinux.ru/import/autogen/commit/d773f874326700a8aeef935351dab2b915575a7c + +diff -up autogen-5.18.3/autoopts/mk-tpl-config.sh.mktplconfig autogen-5.18.3/autoopts/mk-tpl-config.sh +--- autogen-5.18.3/autoopts/mk-tpl-config.sh.mktplconfig 2014-05-10 17:48:26.000000000 +0200 ++++ autogen-5.18.3/autoopts/mk-tpl-config.sh 2014-05-27 14:05:26.961175451 +0200 +@@ -200,9 +200,8 @@ fix_guile() { + cd ${builddir} + find_libguiledir "${LGCFLAGS}" + +- list=`set +e ; exec 2>/dev/null +- find ${libguiledir}/libguile* -type f | \ +- xargs grep -l -E '\<noreturn\>'` ++ list=`find ${libguiledir}/libguile* -type f | \ ++ xargs grep -l -E '\<noreturn\>' 2> /dev/null || :` + + test -z "$list" && exit 0 + diff --git a/development/autogen/autogen.SlackBuild b/development/autogen/autogen.SlackBuild index 007b430a7ce4..60d7b2922e68 100644 --- a/development/autogen/autogen.SlackBuild +++ b/development/autogen/autogen.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=autogen VERSION=${VERSION:-5.18.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -70,6 +70,10 @@ 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 {} \; +# Added patch to work with newer guile in -current +# Should be safe on -stable as well +patch -p1 < $CWD/autogen-mktplconfig.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |