Switch to new compile-r7rs
This commit is contained in:
		
							parent
							
								
									c4b685df89
								
							
						
					
					
						commit
						3183946989
					
				| 
						 | 
					@ -1,9 +1,3 @@
 | 
				
			||||||
ARG COMPILE_R7RS=chibi
 | 
					 | 
				
			||||||
FROM schemers/sagittarius AS build
 | 
					 | 
				
			||||||
RUN apt-get update && apt-get install -y wget build-essential make cmake libgc-dev zlib1g-dev libffi-dev libssl-dev
 | 
					 | 
				
			||||||
RUN wget https://github.com/ktakashi/sagittarius-scheme/releases/download/v0.9.13/sagittarius-0.9.13.tar.gz && tar -xf sagittarius-0.9.13.tar.gz
 | 
					 | 
				
			||||||
RUN cd sagittarius-0.9.13 && ./dist.sh gen && cmake -DCMAKE_INSTALL_PREFIX=/usr/local-other && make && make install
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
FROM schemers/${COMPILE_R7RS}
 | 
					FROM schemers/${COMPILE_R7RS}
 | 
				
			||||||
RUN apt-get update && apt-get install -y \
 | 
					RUN apt-get update && apt-get install -y \
 | 
				
			||||||
    build-essential \
 | 
					    build-essential \
 | 
				
			||||||
| 
						 | 
					@ -15,9 +9,8 @@ RUN apt-get update && apt-get install -y \
 | 
				
			||||||
    libuv1 \
 | 
					    libuv1 \
 | 
				
			||||||
    build-essential \
 | 
					    build-essential \
 | 
				
			||||||
    libffi-dev \
 | 
					    libffi-dev \
 | 
				
			||||||
    libmbedtls-dev
 | 
					    libmbedtls-dev \
 | 
				
			||||||
COPY --from=build /usr/local-other /usr/local-other
 | 
					    chicken-bin
 | 
				
			||||||
ENV PATH=${PATH}:/usr/local-other/bin
 | 
					 | 
				
			||||||
RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
 | 
					RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
 | 
				
			||||||
RUN cd compile-r7rs && make && make install
 | 
					RUN cd compile-r7rs && make && make install
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,10 +1,13 @@
 | 
				
			||||||
(cond-expand
 | 
					(cond-expand
 | 
				
			||||||
  (windows (define-c-library libc '("stdio.h" "string.h") "ucrtbase" '()))
 | 
					  (windows (define-c-library libc
 | 
				
			||||||
 | 
					                             '("stdlib.h" "stdio.h" "string.h")
 | 
				
			||||||
 | 
					                             "ucrtbase"
 | 
				
			||||||
 | 
					                             '()))
 | 
				
			||||||
  (else
 | 
					  (else
 | 
				
			||||||
    ;(define c-library "c")
 | 
					    (define c-library "c")
 | 
				
			||||||
    #;(when (get-environment-variable "BE_HOST_CPU")
 | 
					    (when (get-environment-variable "BE_HOST_CPU")
 | 
				
			||||||
      (set! c-library "root"))
 | 
					      (set! c-library "root"))
 | 
				
			||||||
    (define-c-library libc
 | 
					    (define-c-library libc
 | 
				
			||||||
                      '("stdio.h" "string.h")
 | 
					                      '("stdlib.h" "stdio.h" "string.h")
 | 
				
			||||||
                      "c"
 | 
					                      "c"
 | 
				
			||||||
                      '((additional-versions ("0" "6"))))))
 | 
					                      '((additional-versions ("0" "6"))))))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue