Skip to content

Commit

Permalink
libarpack RPATH $ORIGIN is handle by configure now
Browse files Browse the repository at this point in the history
patchelf bin is not required and was a no-op
  • Loading branch information
vtjnash committed Sep 6, 2016
1 parent 19de9a0 commit 2de03b0
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions deps/arpack.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ else ifeq ($(USE_SYSTEM_LAPACK), 0)
$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-configured: | $(build_prefix)/manifest/lapack
endif

ifneq ($(PATCHELF),patchelf)
# this is actually required by the stage-arpack target, but there's no easy way to hook into that
$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-compiled: | $(build_prefix)/manifest/patchelf
endif

ARPACK_FFLAGS := $(USE_BLAS_FFLAGS)
ARPACK_CFLAGS :=

Expand Down Expand Up @@ -82,11 +77,6 @@ define ARPACK_INSTALL
ifeq ($(OS), WINNT)
mv $2/$$(build_shlibdir)/libarpack-2.dll $2/$$(build_shlibdir)/libarpack.$$(SHLIB_EXT)
endif
ifeq ($(OS), Linux)
for filename in $2/$$(build_shlibdir)/libarpack.so* ; do \
[ -L $$$$filename ] || $$(PATCHELF_BIN) --set-rpath '$$$$ORIGIN' $$$$filename ;\
done
endif
endef

$(eval $(call staged-install, \
Expand Down

0 comments on commit 2de03b0

Please sign in to comment.