[arch-commits] Commit in clisp/trunk (3 files)

[Bartłomiej Piotrowski]

    Date: Sunday, November 6, 2016 @ 21:12:46
  Author: bpiotrowski
Revision: 279976

Fix build with readline 7.0 and gcc 6

Added:
  clisp/trunk/patch-modules_readline_readline.lisp
Modified:
  clisp/trunk/PKGBUILD
  clisp/trunk/clisp-gcc5.patch

--------------------------------------+
 PKGBUILD                             |    7 +++++--
 clisp-gcc5.patch                     |    8 ++++----
 patch-modules_readline_readline.lisp |   15 +++++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-06 20:40:10 UTC (rev 279975)
+++ PKGBUILD	2016-11-06 21:12:46 UTC (rev 279976)
@@ -12,13 +12,16 @@
 makedepends=('ffcall')
 options=('!makeflags' '!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/clisp/clisp-${pkgver}.tar.bz2"
-        "clisp-gcc5.patch")
+        "clisp-gcc5.patch"
+        "patch-modules_readline_readline.lisp")
 md5sums=('1962b99d5e530390ec3829236d168649'
-         'f576778ab7fc879d9509decfd559d32e')
+         'e3008f96f6cd3059717d4a930b8c0e9c'
+         '5b29c9301ab7c1b683da70c2f805609f')
 
 prepare() {
   cd $srcdir/${pkgname}-${pkgver}
   patch -Np1 -i ../clisp-gcc5.patch
+  patch -Np0 -i ../patch-modules_readline_readline.lisp
 }
 
 build() {

Modified: clisp-gcc5.patch
===================================================================
--- clisp-gcc5.patch	2016-11-06 20:40:10 UTC (rev 279975)
+++ clisp-gcc5.patch	2016-11-06 21:12:46 UTC (rev 279976)
@@ -5,7 +5,7 @@
      case "$XCC_GCC_VERSION" in
        # gcc 2.7 introduced an annoying warning, but gcc 2.8 has a workaround:
 -      2.[8-9]* | 3.* | 4.* | egcs-2.*)
-+      2.[8-9]* | 3.* | 4.* | 5.* | egcs-2.*)
++      2.[8-9]* | 3.* | 4.* | 5.* | 6.* | 7.* | 8.* | egcs-2.*)
          XCFLAGS=$XCFLAGS' -Wno-sign-compare -Wno-format-nonliteral'
          ;;
        * ) ;;
@@ -14,7 +14,7 @@
      case "$XCC_GCC_VERSION" in
        # g++ 3.4 introduced an annoying warning, but has a workaround:
 -      3.[4-9]* | 4.*)
-+      3.[4-9]* | 4.* | 5.*)
++      3.[4-9]* | 4.* | 5.* | 6.* | 7.* | 8.*)
          XCFLAGS=$XCFLAGS' -Wno-invalid-offsetof'
          ;;
        * ) ;;
@@ -23,7 +23,7 @@
              # also fixed through the specs file of some Linux distributions).
              XCFLAGS=$XCFLAGS' -O2 -fexpensive-optimizations -fno-strength-reduce' ;;
 -          2.3.[2-9]* | 2.[4-9]* | 3.* | 4.* | egcs-2.*)
-+          2.3.[2-9]* | 2.[4-9]* | 3.* | 4.* | 5.* | egcs-2.*)
++          2.3.[2-9]* | 2.[4-9]* | 3.* | 4.* | 5.* | 6.* | 7.* | 8.* | egcs-2.*)
              XCFLAGS=$XCFLAGS' -O2 -fexpensive-optimizations' ;;
            * )
              XCFLAGS=$XCFLAGS' -O' ;;
@@ -32,7 +32,7 @@
    fi # with_debug
    case "$XCC_GCC_VERSION" in
 -    3* | 4*)
-+    3* | 4* | 5*)
++    3* | 4* | 5* | 6* | 7* | 8*)
        # When not optimizing on linux, or with Apple's gcc 4 on MacOS X,
        # or with GCC 4 when "gcc -Os" is used:
        #   C_CODE_ALIGNMENT is wrong. &EVAL-WHEN = 0x806D512

Added: patch-modules_readline_readline.lisp
===================================================================
--- patch-modules_readline_readline.lisp	                        (rev 0)
+++ patch-modules_readline_readline.lisp	2016-11-06 21:12:46 UTC (rev 279976)
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_readline_readline.lisp,v 1.1 2016/09/20 14:10:25 wiz Exp $
+
+rl_readline_state changed from int to unsigned long in readline-7.0.
+
+--- modules/readline/readline.lisp.orig	2010-01-06 22:18:03.000000000 +0000
++++ modules/readline/readline.lisp
+@@ -424,7 +424,7 @@ name in ~/.inputrc. This is preferred wa
+    "The version of this incarnation of the readline library, e.g., 0x0402."))
+ (def-c-var gnu-readline-p (:name "rl_gnu_readline_p") (:type int)
+   (:documentation "True if this is real GNU readline."))
+-(def-c-var readline-state (:name "rl_readline_state") (:type int)
++(def-c-var readline-state (:name "rl_readline_state") (:type ulong)
+   (:documentation "Flags word encapsulating the current readline state."))
+ (def-c-var editing-mode (:name "rl_editing_mode") (:type int)
+   (:documentation "Says which editing mode readline is currently using.