Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove libatomic_ops dependency #143

Merged
merged 7 commits into from
Dec 8, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 1 addition & 2 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ DOCKER_TAG ?= $(CRYSTAL_VERSION) ## How to tag the docker image (examples: `0.27
DOCKER_REPOSITORY ?= crystallang/crystal ## Docker hub repository to commit image

GC_VERSION = v8.0.4
LIBATOMIC_OPS_VERSION = v7.6.10

OUTPUT_DIR := build
BUILD_CONTEXT := $(CURDIR)/build-context
BUILD_ARGS_UBUNTU64 := --build-arg crystal_targz=crystal.tar.gz $(BUILD_CONTEXT)/ubuntu64 --build-arg base_docker_image=ubuntu:focal
BUILD_ARGS_UBUNTU32 := --build-arg crystal_deb=crystal.deb $(BUILD_CONTEXT)/ubuntu32 --build-arg base_docker_image=i386/ubuntu:bionic
BUILD_ARGS_ALPINE := --build-arg crystal_targz=crystal.tar.gz $(BUILD_CONTEXT)/alpine --build-arg gc_version=$(GC_VERSION) --build-arg libatomic_ops_version=$(LIBATOMIC_OPS_VERSION)
BUILD_ARGS_ALPINE := --build-arg crystal_targz=crystal.tar.gz $(BUILD_CONTEXT)/alpine --build-arg gc_version=$(GC_VERSION)
DOCKER_TAG_UBUNTU := $(DOCKER_REPOSITORY):$(DOCKER_TAG)
DOCKER_TAG_ALPINE := $(DOCKER_REPOSITORY):$(DOCKER_TAG)-alpine

Expand Down
3 changes: 0 additions & 3 deletions docker/alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@ RUN \

# Build libgc
ARG gc_version
ARG libatomic_ops_version
COPY files/feature-thread-stackbottom-upstream.patch /tmp/
RUN git clone https://github.com/ivmai/bdwgc \
&& cd bdwgc \
&& git checkout ${gc_version} \
&& git clone https://github.com/ivmai/libatomic_ops \
&& (cd libatomic_ops && git checkout ${libatomic_ops_version}) \
\
&& patch -p1 < /tmp/feature-thread-stackbottom-upstream.patch \
\
Expand Down
6 changes: 0 additions & 6 deletions linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@ RUN apt-get install -y --allow-downgrades libcurl3-gnutls=7.64.0-4+deb10u2

# Build libgc
ARG gc_version
ARG libatomic_ops_version
COPY files/feature-thread-stackbottom-upstream.patch /tmp/
RUN git clone https://github.com/ivmai/bdwgc \
&& cd bdwgc \
&& git checkout ${gc_version} \
&& git clone https://github.com/ivmai/libatomic_ops \
&& (cd libatomic_ops && git checkout ${libatomic_ops_version}) \
\
&& patch -p1 < /tmp/feature-thread-stackbottom-upstream.patch \
\
Expand All @@ -48,12 +45,9 @@ ENV CFLAGS="-fPIC -pipe ${release:+-O2}"

# Build libgc (again, this time for musl)
ARG gc_version
ARG libatomic_ops_version
RUN git clone https://github.com/ivmai/bdwgc \
&& cd bdwgc \
&& git checkout ${gc_version} \
&& git clone https://github.com/ivmai/libatomic_ops \
&& (cd libatomic_ops && git checkout ${libatomic_ops_version}) \
\
&& ./autogen.sh \
&& ./configure --disable-debug --disable-shared --enable-large-config \
Expand Down
2 changes: 0 additions & 2 deletions linux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ PREVIOUS_CRYSTAL_RELEASE_LINUX32_TARGZ ?= https://github.com/crystal-lang/crysta

SHARDS_VERSION = v0.15.0
GC_VERSION = v8.0.4
LIBATOMIC_OPS_VERSION = v7.6.10
LIBPCRE_VERSION = 8.45

OUTPUT_DIR = build
Expand All @@ -39,7 +38,6 @@ BUILD_ARGS_COMMON = $(DOCKER_BUILD_ARGS) \
--build-arg crystal_sha1=$(CRYSTAL_SHA1) \
--build-arg shards_version=$(SHARDS_VERSION) \
--build-arg gc_version=$(GC_VERSION) \
--build-arg libatomic_ops_version=$(LIBATOMIC_OPS_VERSION) \
--build-arg package_iteration=$(PACKAGE_ITERATION)

BUILD_ARGS64 = $(BUILD_ARGS_COMMON) \
Expand Down
2 changes: 0 additions & 2 deletions omnibus/config/software/bdw-gc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
source md5: "67a5093e2f9f381bd550aa891d00b54b"
end

dependency "libatomic_ops"

relative_path "gc-#{version}"

env = with_standard_compiler_flags(with_embedded_path)
Expand Down
32 changes: 0 additions & 32 deletions omnibus/config/software/libatomic_ops.rb

This file was deleted.