Skip to content
Closed
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
4 changes: 3 additions & 1 deletion .github/workflows/.build-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ jobs:
cppunit \
autoconf \
automake \
libgeotiff
libgeotiff \
ninja \
go
shell: bash
- name: Build hyrax-dependencies
run: |
Expand Down
46 changes: 44 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ aws_cdk_tag=1.11.665

aws_s2n_tls=aws_s2n_tls
aws_s2n_tls_tag=v1.6.1
# There is technically a dist - but it requires some extra script shenanigans, so we choose to pull from the tag instead

aws_lc=aws_lc
aws_lc_tag=v1.65.0
# There is no dist - we pull this from github using a tag

bison=bison-3.3
Expand Down Expand Up @@ -91,7 +95,7 @@ stare_dist=$(stare).tar.bz2
# Removed sqlite3 since it's part of OSX and Linux. jhrg 10/20/25
.PHONY: $(deps)
deps = $(site-deps) bison jpeg openjpeg gridfields hdf4 \
hdfeos hdf5 netcdf4 proj gdal stare aws_cdk aws_s2n_tls list-built
hdfeos hdf5 netcdf4 proj gdal stare aws_cdk aws_s2n_tls aws_lc_src list-built

# Removed lots of stuff because for Docker builds, we can use any decent
# yum/rpm repo (e.g. EPEL). jhrg 8/18/21
Expand All @@ -101,7 +105,7 @@ hdfeos hdf5 netcdf4 proj gdal stare aws_cdk aws_s2n_tls list-built
# netCDF4 library does not. So, we added public calls for Direct I/O writes.
# jhrg 1/5/24
.PHONY: $(docker_deps)
docker_deps = $(site-deps) gridfields stare hdf4 hdfeos netcdf4 aws_cdk aws_s2n_tls list-built
docker_deps = $(site-deps) gridfields stare hdf4 hdfeos netcdf4 aws_cdk aws_s2n_tls aws_lc_src list-built

# NB The environment variable $prefix is assumed to be set.
src = src
Expand Down Expand Up @@ -257,6 +261,44 @@ aws_s2n_tls-really-clean: aws_s2n_tls-clean
.PHONY: aws_s2n_tls
aws_s2n_tls: aws_s2n_tls-install-stamp

# AWS lc (conditionally required by AWS SDK)
aws_lc_src=$(src)/$(aws_lc)-$(aws_lc_tag)
aws_lc_prefix=$(prefix)/deps

$(aws_lc_src)-stamp:
git clone --depth 1 https://github.com/aws/aws-lc.git --branch $(aws_lc_tag) $(aws_lc_src)
echo timestamp > $(aws_lc_src)-stamp

aws_lc-configure-stamp: $(aws_lc_src)-stamp
mkdir -p $(aws_lc_src)/build
(cd $(aws_lc_src)/build \
&& cmake .. -GNinja -B . \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$(prefix)/deps)
echo timestamp > aws_lc-configure-stamp

aws_lc-compile-stamp: aws_lc-configure-stamp
(cd $(aws_lc_src)/build && ninja -C .)
# ninja -C . run_tests # Fails! Not necessarily needed?
echo timestamp > aws_lc-compile-stamp

aws_lc-install-stamp: aws_lc-compile-stamp
(cd $(aws_lc_src)/build && ninja install)
echo timestamp > aws_lc-install-stamp

aws_lc_src-clean:
-(cd $(aws_lc_src)/build && ninja clean)

aws_lc-clean: aws_lc_src-clean
-rm aws_lc-*-stamp

aws_lc-really-clean: aws_lc-clean
-rm $(src)/$(aws_lc)-*-stamp
-rm -rf $(aws_lc_src)

.PHONY: aws_lc
aws_lc: aws_lc-install-stamp

# JPEG
jpeg_src=$(src)/$(jpeg)
jpeg_prefix=$(prefix)/deps
Expand Down
2 changes: 1 addition & 1 deletion docker/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ FROM centos:centos7
WORKDIR /root

# Install any needed packages specified in requirements.txt
RUN yum -y install gcc-c++ make cmake git flex bison autoconf automake libtool bc libsqlite3x-devel
RUN yum -y install gcc-c++ make cmake ninja-build go-toolset git flex bison autoconf automake libtool bc libsqlite3x-devel
RUN yum -y install openssl-devel libuuid-devel readline-devel libxml2-devel curl-devel libicu-devel
RUN yum -y install zlib-devel bzip2 bzip2-devel libjpeg-devel rpm-devel rpm-build redhat-rpm-config
RUN yum -y install openjpeg2-devel-2.3.1
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /root

RUN apt-get -y update
RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
RUN apt-get -y install libcurl4-openssl-dev make cmake g++ gcc libcppunit-dev libbz2-dev libssl-dev uuid-dev libtool
RUN apt-get -y install libcurl4-openssl-dev make cmake ninja-build golang-go g++ gcc libcppunit-dev libbz2-dev libssl-dev uuid-dev libtool
RUN apt-get -y install flex bison autoconf automake libreadline-dev libicu-dev libxml2-dev libjpeg-dev bzip2
RUN apt-get -y install git curl xz-utils debhelper devscripts bc libopenjp2-7-dev libproj-dev

Expand Down
Loading