try patch solaris 32bit

roswell · Nov 24, 2024 · 82bc979 · 82bc979
1 parent e15282e
commit 82bc979
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/solaris.yml b/.github/workflows/solaris.yml
@@ -23,10 +23,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sbclpatch: [""]
         os: ['omnios', 'solaris']
         suffix: ['']
         target: ['x86-64', 'x86']
+        sbclpatch: ["20241124_sunos-gnu89"]
         include:
           # default lisp used is sbcl-bin/2.4.8
           - lisp: 'sbcl-bin/2.4.8'
@@ -44,7 +44,7 @@ jobs:
           LISP: ${{ matrix.lisp }}
         run: |
           curl -L https://raw.githubusercontent.com/roswell/roswell/master/scripts/install-for-ci.sh | sh
-          ros install snmsts/sn.github
+          ros install snmsts/sn.github roswell/sbcl_bin
           make latest-version zstd sbcl
           sed -i "s/-lzstd/-Wl,-Bstatic -lzstd -Wl,-Bdynamic/g" sbcl/src/runtime/Config.x86*-sunos
       - name: check uploaded

diff --git a/tools-for-build/patch/20241124_sunos-gnu89 b/tools-for-build/patch/20241124_sunos-gnu89
@@ -0,0 +1,13 @@
+diff --git a/src/runtime/Config.x86-sunos b/src/runtime/Config.x86-sunos
+index 10635d1..160363e 100644
+--- a/src/runtime/Config.x86-sunos
++++ b/src/runtime/Config.x86-sunos
+@@ -10,7 +10,7 @@
+ # files for more information.
+
+ CC=gcc
+-CFLAGS += -g -O2 -Wall -D__EXTENSIONS__ -DSVR4 -D_REENTRANT -fno-omit-frame-pointer -D_POSIX_PTHREAD_SEMANTICS -m32
++CFLAGS += -g -O2 -Wall -std=gnu89 -D__EXTENSIONS__ -DSVR4 -D_REENTRANT -fno-omit-frame-pointer -D_POSIX_PTHREAD_SEMANTICS -m32
+ LINKFLAGS += -m32
+ GREP = ggrep
+