aboutsummaryrefslogtreecommitdiff
path: root/reproduce/src
diff options
context:
space:
mode:
Diffstat (limited to 'reproduce/src')
-rw-r--r--reproduce/src/make/dependencies-build-rules.mk7
-rw-r--r--reproduce/src/make/dependencies.mk10
2 files changed, 9 insertions, 8 deletions
diff --git a/reproduce/src/make/dependencies-build-rules.mk b/reproduce/src/make/dependencies-build-rules.mk
index b7d6c1a..479b008 100644
--- a/reproduce/src/make/dependencies-build-rules.mk
+++ b/reproduce/src/make/dependencies-build-rules.mk
@@ -98,9 +98,8 @@ cbuild = if [ x$(static_build) = xyes ] && [ $(3)x = staticx ]; then \
cd $(ddir) && rm -rf $(2) && tar xf $(1) && cd $(2) && \
rm -rf pipeline-build && mkdir pipeline-build && \
cd pipeline-build && \
- cmake .. $$opts $(4) && \
- cmake --build . && \
- cmake .. -DCMAKE_INSTALL_PREFIX=$(idir) && \
- cmake --build . --target install && \
+ cmake .. -DCMAKE_LIBRARY_PATH=$(ildir) \
+ -DCMAKE_INSTALL_PREFIX=$(idir) $$opts $(4) && \
+ make && make install && \
cd ../.. && \
rm -rf $(2)
diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk
index dc9e053..9f16615 100644
--- a/reproduce/src/make/dependencies.mk
+++ b/reproduce/src/make/dependencies.mk
@@ -59,7 +59,7 @@ export SHELL := $(ibdir)/bash
export CPPFLAGS := -I$(idir)/include
export PKG_CONFIG_PATH := $(ildir)/pkgconfig
export PKG_CONFIG_LIBDIR := $(ildir)/pkgconfig
-export LDFLAGS := -Wl,-rpath-link=$(ildir) -L$(ildir)
+export LDFLAGS := $(rpath_command) -L$(ildir)
@@ -193,11 +193,13 @@ $(ilidir)/libtiff: $(tdir)/tiff-$(libtiff-version).tar.gz \
$(ilidir)/wcslib: $(tdir)/wcslib-$(wcslib-version).tar.bz2 \
$(ilidir)/cfitsio | $(ilidir)
- # Unfortunately WCSLIB forces the building of shared libraries.
+ # Unfortunately WCSLIB forces the building of shared libraries. So
+ # we'll just delete any shared library that is produced afterwards.
$(call gbuild, $<, wcslib-$(wcslib-version), , \
LIBS="-pthread -lcurl -lm" --without-pgplot \
- --disable-fortran) \
- && echo "WCSLIB is built" > $@
+ --disable-fortran) && \
+ rm -f $(ildir)/libwcs.so* $(ildir)/libwcs*.dylib && \
+ echo "WCSLIB is built" > $@
# Zlib: its `./configure' doesn't use Autoconf's configure script, it just
# accepts a direct `--static' option.