[arch-commits] Commit in cmucl/trunk (2 files)

[Jürgen Hötzel]

    Date: Monday, May 27, 2019 @ 14:59:36
  Author: juergen
Revision: 471473

upgpkg: cmucl 21d-1

add gcc-8 workaround

Added:
  cmucl/trunk/0001-Fix-68-Use-O1-when-compiling-with-gcc-now.patch
Modified:
  cmucl/trunk/PKGBUILD

------------------------------------------------------+
 0001-Fix-68-Use-O1-when-compiling-with-gcc-now.patch |   33 +++++++++++++++++
 PKGBUILD                                             |   22 +++++------
 2 files changed, 43 insertions(+), 12 deletions(-)

Added: 0001-Fix-68-Use-O1-when-compiling-with-gcc-now.patch
===================================================================
--- 0001-Fix-68-Use-O1-when-compiling-with-gcc-now.patch	                        (rev 0)
+++ 0001-Fix-68-Use-O1-when-compiling-with-gcc-now.patch	2019-05-27 14:59:36 UTC (rev 471473)
@@ -0,0 +1,33 @@
+From 9bd292bd1fca41d438d6eaeedec04c23cc442d4f Mon Sep 17 00:00:00 2001
+From: Raymond Toy <toy.raymond at gmail.com>
+Date: Tue, 16 Apr 2019 19:17:32 -0700
+Subject: [PATCH] Fix #68: Use -O1 when compiling with gcc now
+
+As reported gcc 8.1.1 can't produce a working lisp.  gcc 8.3.1 also
+fails.  But as reported on cmucl-imp, 2019-04-08, by Juan Pablo Hierro
+Alverez, -O1 works.
+
+Use -O1.
+---
+ src/lisp/Config.x86_common | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/lisp/Config.x86_common b/src/lisp/Config.x86_common
+index 31aebfc1e..d5537657b 100644
+--- a/src/lisp/Config.x86_common
++++ b/src/lisp/Config.x86_common
+@@ -44,7 +44,10 @@ endif
+ 
+ CPPFLAGS := $(CPP_DEFINE_OPTIONS) $(CPP_INCLUDE_OPTIONS) 
+ CFLAGS += -Wstrict-prototypes -Wall -g -fno-omit-frame-pointer
+-CFLAGS += -O2
++
++# gcc 8.1.1 and 8.3.1 (and probably anything after 8.1.1?) won't
++# produce a working lisp with -O2.  Just use -O1.
++CFLAGS += -O1
+ ASFLAGS = -g 
+ 
+ ASSEM_SRC = x86-assem.S
+-- 
+2.21.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-27 14:59:29 UTC (rev 471472)
+++ PKGBUILD	2019-05-27 14:59:36 UTC (rev 471473)
@@ -3,13 +3,13 @@
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=cmucl
-pkgver=21c
+pkgver=21d
 pkgrel=1
 pkgdesc="CMU Common Lisp"
 depends_i686=('glibc' 'openmotif')
 depends_x86_64=('lib32-glibc' 'openmotif')
 provides=('common-lisp')
-makedepends=('sed' 'bc' 'clang')
+makedepends=('sed' 'bc' 'lib32-gcc-libs')
 license=('custom')
 #license PublicDomain
 source=("https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-src-${pkgver}.tar.bz2"
@@ -16,22 +16,20 @@
         "https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-src-${pkgver}.tar.bz2.asc"
         "https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2"
         "https://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2.asc"
-        82bf2c727ba1d3c461fa360aaae176608eb9349b.patch)
-sha256sums=('3435963b594d44b5ca0e12674222b40fb00b3c44ea0226fead5d66041369a74d'
+	'0001-Fix-68-Use-O1-when-compiling-with-gcc-now.patch')
+sha256sums=('657d9332ef0453a513a55c4ed84993ac5157e215efa423d2d7aa432a4bbc4ab4'
             'SKIP'
-            'f94a79ca4c2918cc4e7bdc58c934c98e56accc3c08f7cccde70ade02ab438105'
+            '45d72d72a3d3b5087561bdc1ae943c8ed445427f3939cc0eb7597dd07eb10d9b'
             'SKIP'
-            '6cb5b7921bee5c5cba19939de635870f56f1bce662d457aeccde29878a4d0ebc')
+            '48ef3fd1038cc0c53c4a5151f5a3eccde1ac58cef28f4dfc8553b5f7977ea9c9')
 validpgpkeys=('0EF50ED55514BFF6B72B9DAC06CE3819086C750B') # "Raymond Toy <toy.raymond at gmail.com>
 url="https://www.cons.org/cmucl/"
 arch=('x86_64')
 
 prepare() {
-  cd "${srcdir}"
-  patch -p1 -i 82bf2c727ba1d3c461fa360aaae176608eb9349b.patch
-
+  patch -p1 -d "${srcdir}" -i "${srcdir}/0001-Fix-68-Use-O1-when-compiling-with-gcc-now.patch"
   if [[ $CARCH == "i686" ]]; then
-    sed -i 's|i386\*|i686\*|' bin/build-all.sh
+    sed -i 's|i386\*|i686\*|' "${srcdir}"/bin/build-all.sh
   fi
 }
 
@@ -39,13 +37,13 @@
   cd "${srcdir}"
   export CMUCLLIB="${srcdir}"/lib/cmucl/lib
   # Build using binary-dist lisp
-  ./bin/build-all.sh -o "${srcdir}"/bin/lisp -C x86_linux_clang
+  ./bin/build-all.sh -o "${srcdir}"/bin/lisp -C x86_linux
 }
 
 package() {
   cd "${srcdir}"
   # install distribution
-  ./bin/make-dist.sh -I "${pkgdir}"/usr -M share/man/man1 -V 21c linux-4
+  ./bin/make-dist.sh -I "${pkgdir}"/usr -M share/man/man1 -V ${pkgver} linux-4
   # move docs
   mv "${pkgdir}"/usr/doc "${pkgdir}"/usr/share/
   # backwards compatibility