Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG llvm_version=20
RUN \
apk add --update --no-cache --force-overwrite \
# core dependencies
gcc gmp-dev libevent-static musl-dev pcre-dev pcre2-dev pcre2-static \
gcc gmp-dev musl-dev pcre-dev pcre2-dev pcre2-static \
# stdlib dependencies
gc-dev gc-static libxml2-dev libxml2-static openssl-dev openssl-libs-static tzdata yaml-static zlib-static xz-static \
# dev tools
Expand All @@ -28,6 +28,6 @@ FROM runtime as build
RUN \
apk add --update --no-cache --force-overwrite \
llvm${llvm_version}-dev llvm${llvm_version}-static \
g++ libffi-dev
libevent-static g++ libffi-dev

CMD ["/bin/sh"]
4 changes: 2 additions & 2 deletions docker/ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN \
apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt-get install -y tzdata gcc pkg-config libssl-dev libxml2-dev libyaml-dev libgmp-dev git make \
libpcre3-dev libpcre2-dev libevent-dev libz-dev libgc-dev && \
libpcre3-dev libpcre2-dev libz-dev libgc-dev && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

ARG crystal_targz
Expand All @@ -24,7 +24,7 @@ FROM runtime as build

RUN \
apt-get update && \
apt-get install -y build-essential llvm-${llvm_version} lld-${llvm_version} libedit-dev gdb libffi-dev && \
apt-get install -y build-essential llvm-${llvm_version} lld-${llvm_version} libedit-dev libevent-dev gdb libffi-dev && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

RUN ln -sf /usr/bin/ld.lld-${llvm_version} /usr/bin/ld.lld
Expand Down
2 changes: 1 addition & 1 deletion linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN apk add --no-cache \
# Statically-compiled llvm
llvm${llvm_version}-dev llvm${llvm_version}-static \
# Static stdlib dependencies
gc-dev gc-static zlib-static yaml-static libxml2-static pcre2-dev pcre2-static libevent-static zstd-static \
gc-dev gc-static zlib-static yaml-static libxml2-static pcre2-dev pcre2-static zstd-static \
# Static compiler dependencies
libffi-dev \
# Build tools
Expand Down
4 changes: 1 addition & 3 deletions linux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ PREVIOUS_CRYSTAL_RELEASE_LINUX64_TARGZ ?= https://github.com/crystal-lang/crysta
SHARDS_VERSION = v0.19.1
GC_VERSION = v8.2.8
LIBPCRE2_VERSION = 10.44
LIBEVENT_VERSION = release-2.1.12-stable

OUTPUT_DIR = build
OUTPUT_BASENAME64 = $(OUTPUT_DIR)/crystal-$(CRYSTAL_VERSION)-$(PACKAGE_ITERATION)-linux-x86_64
Expand All @@ -46,8 +45,7 @@ BUILD_ARGS64 = $(BUILD_ARGS_COMMON) \
--build-arg gnu_target=x86_64-unknown-linux-gnu

BUILD_ARGS64_BUNDLED = $(BUILD_ARGS64) \
--build-arg libpcre2_version=$(LIBPCRE2_VERSION) \
--build-arg libevent_version=$(LIBEVENT_VERSION)
--build-arg libpcre2_version=$(LIBPCRE2_VERSION)

.PHONY: all
all: all64 ## Build all distribution tarballs [default]
Expand Down
13 changes: 0 additions & 13 deletions linux/bundled.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,15 @@ RUN curl -L https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${libp
&& ./configure --disable-shared --disable-cpp --enable-jit --enable-utf --enable-unicode-properties \
&& make -j$(nproc)

# build libevent

FROM debian AS libevent
ARG libevent_version
RUN git clone https://github.com/libevent/libevent \
&& cd libevent \
&& git checkout ${libevent_version} \
&& ./autogen.sh \
&& ./configure --disable-shared --disable-openssl \
&& make -j$(nproc)

FROM debian
ARG crystal_version
ARG package_iteration
ARG libpcre2_version
ARG libevent_version

RUN mkdir -p /output/lib/crystal/lib/

# Copy libraries
COPY --from=libpcre2 pcre2-${libpcre2_version}/.libs/libpcre2-8.a /output/lib/crystal/
COPY --from=libevent libevent/.libs/libevent.a libevent/.libs/libevent_pthreads.a /output/lib/crystal/

# Create tarball
RUN mv /output /crystal-${crystal_version}-${package_iteration} \
Expand Down
1 change: 0 additions & 1 deletion omnibus/config/software/crystal.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
dependency "pcre2"
dependency "bdw-gc"
dependency "llvm_bin" unless FIRST_RUN
dependency "libevent"
dependency "libffi"

env = with_standard_compiler_flags(with_embedded_path(
Expand Down
23 changes: 0 additions & 23 deletions omnibus/config/software/libevent.rb

This file was deleted.

2 changes: 1 addition & 1 deletion snapcraft/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The following are the suggested packages to be able to use the whole standard li

```
$ sudo apt-get install gcc pkg-config git tzdata \
libpcre2-dev libevent-dev libyaml-dev \
libpcre2-dev libyaml-dev \
libgmp-dev libssl-dev libxml2-dev
```

Expand Down
2 changes: 1 addition & 1 deletion snapcraft/crystal-snap-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [ ! -f $SNAP_USER_COMMON/env-check-success ]; then
The following are the suggested packages to be able to use the whole standard library capabilities.

$ sudo apt-get install gcc pkg-config git tzdata \\
libpcre2-dev libevent-dev libyaml-dev \\
libpcre2-dev libyaml-dev \\
libgmp-dev libssl-dev libxml2-dev

You can find more detailed information in:
Expand Down