normalize deps Makefile targets

using a consistent mapping between target names reduces the coupling between targets
and should make it easier to add features like reinstall, uninstall, etc.

and it fixes JuliaLang#17671 and JuliaLang#17282

Make.inc

@@ -1004,9 +1004,8 @@ endif
 
 # ATLAS
 
-# ATLAS must have been previously built with "make -C deps compile-atlas" (without -jN),
-# or installed to usr/lib/libatlas from some another source (built as
-# a shared library, for your platform, single threaded)
+# ATLAS must have been previously installed to usr/lib/libatlas
+# (built as a shared library, for your platform, single threaded)
 USE_ATLAS := 0
 ATLAS_LIBDIR := $(build_libdir)
 #or ATLAS_LIBDIR := /path/to/system/atlas/lib

contrib/check-whitespace.sh

@@ -16,6 +16,7 @@ file_patterns='
 *.scm
 *.inc
 *.make
+*.mk
 *.md
 *.rst
 *.sh

deps/Makefile

@@ -1,4 +1,5 @@
 ## high-level setup ##
+default: install
 SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 JULIAHOME := $(abspath $(SRCDIR)/..)
 ifeq ($(abspath .),$(abspath $(SRCDIR)))
@@ -8,12 +9,13 @@ BUILDDIR := .
 endif
 include $(SRCDIR)/Versions.make
 include $(JULIAHOME)/Make.inc
-include $(SRCDIR)/llvm-ver.make
+include $(SRCDIR)/tools/common.mk
+include $(SRCDIR)/tools/git-external.mk
 
 # Special comments:
 #
 # all targets in here should follow the same structure,
-# and provide a get-a, configure-a, compile-a, check-a, and install-a
+# and provide a get-a, extract-a, configure-a, compile-a, check-a, and install-a
 # additionally all targets should be listed in the getall target for easier off-line compilation
 # if you are adding a new target, it can help to copy an similar, existing target
 #
@@ -30,70 +32,15 @@ include $(SRCDIR)/llvm-ver.make
 # be rebuilt in a single invocation
 #
 
-## Some shared configuration options ##
-
-CONFIGURE_COMMON := --prefix=$(abspath $(build_prefix)) --build=$(BUILD_MACHINE) --libdir=$(abspath $(build_libdir)) --bindir=$(abspath $(build_depsbindir)) $(CUSTOM_LD_LIBRARY_PATH)
-ifneq ($(XC_HOST),)
-CONFIGURE_COMMON += --host=$(XC_HOST)
-endif
-ifeq ($(OS),WINNT)
-ifneq ($(USEMSVC), 1)
-CONFIGURE_COMMON += LDFLAGS="$(LDFLAGS) -Wl,--stack,8388608"
-endif
-endif
-CONFIGURE_COMMON += F77="$(FC)" CC="$(CC) $(DEPS_CFLAGS)" CXX="$(CXX) $(DEPS_CXXFLAGS)"
-
-CMAKE_CC_ARG := $(CC_ARG) $(DEPS_CFLAGS)
-CMAKE_CXX_ARG := $(CXX_ARG) $(DEPS_CXXFLAGS)
-
-CMAKE_COMMON := -DCMAKE_INSTALL_PREFIX:PATH=$(build_prefix) -DCMAKE_PREFIX_PATH=$(build_prefix)
-CMAKE_COMMON += -DCMAKE_INSTALL_LIBDIR=$(build_libdir) -DCMAKE_INSTALL_BINDIR=$(build_bindir)
-CMAKE_COMMON += -DLIB_INSTALL_DIR=$(build_shlibdir)
-ifneq ($(VERBOSE), 0)
-CMAKE_COMMON += -DCMAKE_VERBOSE_MAKEFILE=ON
-endif
-# The call to which here is to work around https://cmake.org/Bug/view.php?id=14366
-CMAKE_COMMON += -DCMAKE_C_COMPILER="$$(which $(CC_BASE))"
-ifneq ($(strip $(CMAKE_CC_ARG)),)
-CMAKE_COMMON += -DCMAKE_C_COMPILER_ARG1="$(CMAKE_CC_ARG)"
-endif
-CMAKE_COMMON += -DCMAKE_CXX_COMPILER="$(CXX_BASE)"
-ifneq ($(strip $(CMAKE_CXX_ARG)),)
-CMAKE_COMMON += -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_ARG)"
-endif
-
-ifeq ($(OS),WINNT)
-CMAKE_COMMON += -DCMAKE_SYSTEM_NAME=Windows
-ifneq ($(BUILD_OS),WINNT)
-CMAKE_COMMON += -DCMAKE_RC_COMPILER="$$(which $(CROSS_COMPILE)windres)"
-endif
-endif
-
-# For now this is LLVM specific, but I expect it won't be in the future
-ifeq ($(LLVM_USE_CMAKE),1)
-ifeq ($(CMAKE_GENERATOR),Ninja)
-CMAKE_GENERATOR_COMMAND := -G Ninja
-else ifeq ($(CMAKE_GENERATOR),make)
-CMAKE_GENERATOR_COMMAND := -G "Unix Makefiles"
-else
-$(error Unknown CMake generator '$(CMAKE_GENERATOR)'. Options are 'Ninja' and 'make')
-endif
-endif
-
-# If the top-level Makefile is called with environment variables,
-# they will override the values passed above to ./configure
-MAKE_COMMON := DESTDIR="" prefix=$(build_prefix) bindir=$(build_depsbindir) libdir=$(build_libdir) shlibdir=$(build_shlibdir) libexecdir=$(build_libexecdir) datarootdir=$(build_datarootdir) includedir=$(build_includedir) sysconfdir=$(build_sysconfdir) O=
-
-
 ## Overall configuration of which rules exist and should be run by default ##
 
 # prevent installing libs into usr/lib64 on opensuse
 unexport CONFIG_SITE
 
-ifeq ($(USE_GPL_LIBS), 1)
-DEP_LIBS := suitesparse-wrapper
-else
 DEP_LIBS :=
+
+ifeq ($(USE_GPL_LIBS), 1)
+DEP_LIBS += suitesparse-wrapper
 endif
 
 ifeq ($(USE_SYSTEM_LIBUV), 0)
@@ -164,22 +111,8 @@ DEP_LIBS += gmp
 endif
 
 ifeq ($(USE_SYSTEM_LIBGIT2), 0)
-ifeq ($(USE_SYSTEM_MBEDTLS), 0)
-DEP_LIBS += mbedtls
-endif
-
-ifeq ($(USE_SYSTEM_LIBSSH2), 0)
-DEP_LIBS += libssh2
-endif
-
-ifneq ($(OS), WINNT)
-ifeq ($(USE_SYSTEM_CURL), 0)
-DEP_LIBS += curl
-endif
-endif
-
 DEP_LIBS += libgit2
-endif # USE_SYSTEM_LIBGIT2
+endif
 
 ifeq ($(USE_SYSTEM_MPFR), 0)
 DEP_LIBS += mpfr
@@ -209,16 +142,11 @@ DEP_LIBS += lapack
 endif
 endif
 
-#Platform specific flags
-
-ifeq ($(OS), WINNT)
-LIBTOOL_CCLD := CCLD="$(CC) -no-undefined -avoid-version"
-endif
-
 ## Common build target prefixes
 
-default: install | $(build_prefix)
+default: | $(build_prefix)
 get: $(addprefix get-, $(DEP_LIBS))
+extract: $(addprefix extract-, $(DEP_LIBS))
 configure: $(addprefix configure-, $(DEP_LIBS))
 compile: $(addprefix compile-, $(DEP_LIBS))
 check: $(addprefix check-, $(DEP_LIBS))
@@ -228,35 +156,6 @@ distcleanall: $(addprefix distclean-, $(DEP_LIBS))
  rm -rf $(build_prefix)
 getall: get-llvm get-libuv get-pcre get-openlibm get-openspecfun get-dsfmt get-openblas get-lapack get-fftw get-suitesparse get-arpack get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-virtualenv get-objconv get-mbedtls get-libssh2 get-curl get-libgit2
 
-## PATHS ##
-# sort is used to remove potential duplicates
-DIRS := $(sort $(build_bindir) $(build_depsbindir) $(build_libdir) $(build_includedir) $(build_sysconfdir) $(build_datarootdir) $(build_staging))
-
-$(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir))))
-
-$(build_prefix): | $(DIRS)
-$(eval $(call dir_target,$(SRCDIR)/srccache))
-
-## A rule for calling `make install` ##
-# rule: dependencies
-# $(call make-install,rel-build-directory,add-args)
-# touch -c $@
-# this rule ensures that make install is more nearly atomic
-# so it's harder to get half-installed (or half-reinstalled) dependencies
-MAKE_DESTDIR = "$(build_staging)/$1"
-define staged-install
- rm -rf $(build_staging)/$1
- $2
- mkdir -p $(build_prefix)
- cp -af $(build_staging)/$1$(build_prefix)/* $(build_prefix)
-endef
-
-define make-install
- $(call staged-install,$1,+$(MAKE) -C $(BUILDDIR)/$1 install $(MAKE_COMMON) $2 DESTDIR=$(call MAKE_DESTDIR,$1))
-endef
-
-include $(SRCDIR)/tools/git-external.mk
-
 include $(SRCDIR)/llvm.mk
 include $(SRCDIR)/libuv.mk
 include $(SRCDIR)/pcre.mk
@@ -278,9 +177,3 @@ include $(SRCDIR)/libssh2.mk
 include $(SRCDIR)/curl.mk
 include $(SRCDIR)/libgit2.mk
 include $(SRCDIR)/virtualenv.mk
-
-## phony targets ##
-
-.PHONY: default compile install cleanall distcleanall \
- get-* configure-* compile-* check-* install-* \
- clean-* distclean-* reinstall-* update-llvm

deps/arpack.mk

@@ -1,5 +1,6 @@
 ## ARPACK ##
-ARPACK_FFLAGS := $(GFORTBLAS_FFLAGS)
+
+ARPACK_FFLAGS := $(USE_BLAS_FFLAGS)
 ARPACK_CFLAGS :=
 
 ifeq ($(USE_BLAS64), 1)
@@ -23,13 +24,6 @@ endif
 endif
 endif
 
-ifeq ($(OS),WINNT)
-ARPACK_OBJ_SOURCE := $(BUILDDIR)/arpack-ng-$(ARPACK_VER)/.libs/libarpack-2.$(SHLIB_EXT)
-else
-ARPACK_OBJ_SOURCE := $(BUILDDIR)/arpack-ng-$(ARPACK_VER)/.libs/libarpack.$(SHLIB_EXT)
-endif
-ARPACK_OBJ_TARGET := $(build_shlibdir)/libarpack.$(SHLIB_EXT)
-
 ARPACK_MFLAGS := F77="$(FC)" MPIF77="$(FC)"
 ARPACK_FFLAGS += $(FFLAGS) $(JFFLAGS)
 ARPACK_FLAGS := --with-blas="$(LIBBLAS)" --with-lapack="$(LIBLAPACK)" \
@@ -43,66 +37,70 @@ $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER).tar.gz: | $(SRCDIR)/srccache
 $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)-testA.mtx: | $(SRCDIR)/srccache
  $(JLDOWNLOAD) $@ https://raw.githubusercontent.com/opencollab/arpack-ng/$(ARPACK_VER)/TESTS/testA.mtx
  touch -c $@
-$(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)/configure: $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER).tar.gz
+
+$(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)/source-extracted: $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER).tar.gz
  $(JLCHECKSUM) $<
  cd $(dir $<) && $(TAR) zxf $<
- touch -c $@
-
-ifeq ($(USE_ATLAS), 1)
-$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/config.status: | $(ATLAS_OBJ_TARGET)
-endif
+ echo 1 > $@
 
 ifeq ($(USE_SYSTEM_BLAS), 0)
-$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/config.status: | $(OPENBLAS_OBJ_TARGET)
+$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-configured: | $(build_prefix)/manifest/openblas
 else ifeq ($(USE_SYSTEM_LAPACK), 0)
-$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/config.status: | $(LAPACK_OBJ_TARGET)
+$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-configured: | $(build_prefix)/manifest/lapack
 endif
 
-$(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)/arpack-tests-blasint.patch-applied: $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)/configure
+$(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)/arpack-tests-blasint.patch-applied: $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)/source-extracted
  cd $(dir $@) && patch -p1 < $(SRCDIR)/patches/arpack-tests-blasint.patch
  echo 1 > $@
-$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/config.status: $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)/configure $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)/arpack-tests-blasint.patch-applied
+
+$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-configured: $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)/source-extracted $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)/arpack-tests-blasint.patch-applied
  mkdir -p $(dir $@)
  cd $(dir $@) && \
- $< $(CONFIGURE_COMMON) $(ARPACK_FLAGS)
- touch -c $@
-$(ARPACK_OBJ_SOURCE): $(BUILDDIR)/arpack-ng-$(ARPACK_VER)/config.status
+ $(dir $<)/configure $(CONFIGURE_COMMON) $(ARPACK_FLAGS)
+ echo 1 > $@
+
+$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-compiled: $(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-configured
  $(MAKE) -C $(dir $<) $(ARPACK_MFLAGS)
- touch -c $@
-$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/checked: $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)-testA.mtx $(ARPACK_OBJ_SOURCE)
+ echo 1 > $@
+
+$(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-checked: $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)-testA.mtx $(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-compiled
  $(JLCHECKSUM) $<
  cp $< $(dir $@)/TESTS/testA.mtx
 ifeq ($(OS),$(BUILD_OS))
  $(MAKE) -C $(dir $@) check $(ARPACK_MFLAGS)
 endif
  echo 1 > $@
-$(ARPACK_OBJ_TARGET): $(ARPACK_OBJ_SOURCE) | $(build_shlibdir)
+
+$(build_prefix)/manifest/arpack: $(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-compiled | $(build_shlibdir)
  $(call make-install,arpack-ng-$(ARPACK_VER),$(ARPACK_MFLAGS))
 ifeq ($(OS), WINNT)
- mv $(build_shlibdir)/libarpack-2.dll $@
+ mv $(build_shlibdir)/libarpack-2.dll $(build_shlibdir)/libarpack.$(SHLIB_EXT)
 endif
  $(INSTALL_NAME_CMD)libarpack.$(SHLIB_EXT) $(build_shlibdir)/libarpack.$(SHLIB_EXT)
 ifeq ($(OS), Linux)
  for filename in $(build_shlibdir)/libarpack.so* ; do \
  [ -L $$filename ] || $(PATCHELF_BIN) --set-rpath '$$ORIGIN' $$filename ;\
  done
 endif
- touch -c $@
+ echo $(ARPACK_VER) > $@
+
 ifneq ($(PATCHELF),patchelf)
-$(ARPACK_OBJ_TARGET): $(PATCHELF)
+$(build_prefix)/manifest/arpack: $(PATCHELF)
 endif
 
 clean-arpack:
+ -rm -f $(build_prefix)/manifest/arpack $(build_shlibdir)/libarpack.$(SHLIB_EXT)
  -$(MAKE) -C $(BUILDDIR)/arpack-ng-$(ARPACK_VER) clean
- -rm -f $(ARPACK_OBJ_SOURCE) $(ARPACK_OBJ_TARGET)
+
 distclean-arpack:
  -rm -rf $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER).tar.gz \
  $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER) \
  $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)-testA.mtx \
  $(BUILDDIR)/arpack-ng-$(ARPACK_VER)
 
 get-arpack: $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER).tar.gz $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)-testA.mtx
-configure-arpack: $(BUILDDIR)/arpack-ng-$(ARPACK_VER)/config.status
-compile-arpack: $(ARPACK_OBJ_SOURCE)
-check-arpack: $(BUILDDIR)/arpack-ng-$(ARPACK_VER)/checked
-install-arpack: $(ARPACK_OBJ_TARGET)
+extract-arpack: $(SRCDIR)/srccache/arpack-ng-$(ARPACK_VER)/source-extracted
+configure-arpack: $(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-configured
+compile-arpack: $(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-compiled
+check-arpack: $(BUILDDIR)/arpack-ng-$(ARPACK_VER)/build-checked
+install-arpack: $(build_prefix)/manifest/arpack