[release] less but also more clowny way of shipping dynamic libraries

Summary:
Figure out where libgmp and libmpfr are auto-magically by looking at where
`ldd` (or `otool` on osx) thinks they are.

This way we don't need to hardcode as much.

Reviewed By: ngorogiannis

Differential Revision: D14208580

fbshipit-source-id: 3b2dca5b2

Makefile

@@ -656,28 +656,45 @@ install-with-libs: install
 	test -d      '$(DESTDIR)$(libdir)'/infer/infer/libso || \
 	  $(MKDIR_P) '$(DESTDIR)$(libdir)'/infer/infer/libso
 ifneq ($(OPAM),no)
-	$(INSTALL_PROGRAM) -C $(GMP_LIB_PATH) '$(DESTDIR)$(libdir)'/infer/infer/libso/
-	$(INSTALL_PROGRAM) -C $(MPFR_LIB_PATH) '$(DESTDIR)$(libdir)'/infer/infer/libso/
 	set -x; \
 	OPAM_SHARE=$$($(OPAM) config var share); \
 	APRON_LIB_PATHS="$$OPAM_SHARE/apron/lib/libapron.so $$OPAM_SHARE/apron/lib/liboctMPQ.so"; \
 	ELINA_LIB_PATHS="$$OPAM_SHARE/elina/lib/libelinalinearize.so $$OPAM_SHARE/elina/lib/liboptpoly.so $$OPAM_SHARE/elina/lib/libpartitions.so"; \
 	$(INSTALL_PROGRAM) -C $$APRON_LIB_PATHS '$(DESTDIR)$(libdir)'/infer/infer/libso/; \
 	$(INSTALL_PROGRAM) -C $$ELINA_LIB_PATHS '$(DESTDIR)$(libdir)'/infer/infer/libso/
-#	update rpath of executables
+ifneq ($(LDD),no)
 ifneq ($(PATCHELF),no)
 #	this sort of assumes Linux
+#	figure out where libgmp and libmpfr are using ldd
+	set -x; \
+	for lib in $$($(LDD) $(INFER_BIN) \
+	              | cut -d ' ' -f 3 \
+	              | grep -e 'lib\(gmp\|mpfr\)'); do \
+	  $(INSTALL_PROGRAM) -C "$$lib" '$(DESTDIR)$(libdir)'/infer/infer/libso/; \
+	done
+#	update rpath of executables
 	for sofile in '$(DESTDIR)$(libdir)'/infer/infer/libso/*.so; do \
-	  $(PATCHELF) --set-rpath '$$ORIGIN' "$$sofile"; \
+	  $(PATCHELF) --set-rpath '$$ORIGIN' --force-rpath "$$sofile"; \
 	done
-	$(PATCHELF) --set-rpath '$$ORIGIN/../libso' '$(DESTDIR)$(libdir)'/infer/infer/bin/infer
+	$(PATCHELF) --set-rpath '$$ORIGIN/../libso' --force-rpath '$(DESTDIR)$(libdir)'/infer/infer/bin/infer
 ifeq ($(IS_FACEBOOK_TREE),yes)
-	$(PATCHELF) --set-rpath '$$ORIGIN/../libso' '$(DESTDIR)$(libdir)'/infer/infer/bin/InferCreateTraceViewLinks
+	$(PATCHELF) --set-rpath '$$ORIGIN/../libso' --force-rpath '$(DESTDIR)$(libdir)'/infer/infer/bin/InferCreateTraceViewLinks
 endif
-else # patchelf not found
+else # ldd found but not patchelf
+	echo "ERROR: ldd (Linux?) found but not patchelf, please install patchelf" >&2; exit 1
+endif
+else # ldd not found
 ifneq ($(OTOOL),no)
 ifneq ($(INSTALL_NAME_TOOL),no)
 #	this sort of assumes osx
+#	figure out where libgmp and libmpfr are using otool
+	set -e; \
+	set -x; \
+	for lib in $$($(OTOOL) -L $(INFER_BIN) \
+	              | cut -d ' ' -f 1 | tr -d '\t' \
+	              | grep -e 'lib\(gmp\|mpfr\)'); do \
+	  $(INSTALL_PROGRAM) -C "$$lib" '$(DESTDIR)$(libdir)'/infer/infer/libso/; \
+	done
 	set -x; \
 	for sofile in '$(DESTDIR)$(libdir)'/infer/infer/libso/*.{so,dylib}; do \
 	  $(INSTALL_NAME_TOOL) -add_rpath "@executable_path" "$$sofile" 2> /dev/null || true; \
@@ -690,14 +707,14 @@ ifeq ($(IS_FACEBOOK_TREE),yes)
 	scripts/set_libso_path.sh '$(DESTDIR)$(libdir)'/infer/infer/libso '$(DESTDIR)$(libdir)'/infer/infer/bin/InferCreateTraceViewLinks
 endif
 else # install_name_tool not found
-	echo "ERROR: need patchelf (Linux) or otool + install_name_tool (OSX) available" >&2; exit 1
+	echo "ERROR: otool (OSX?) found but not install_name_tool, please install install_name_tool" >&2; exit 1
 endif
 else # otool not found
-	echo "ERROR: need patchelf (Linux) or otool + install_name_tool (OSX) available" >&2; exit 1
+	echo "ERROR: need ldd + patchelf (Linux) or otool + install_name_tool (OSX) available" >&2; exit 1
 endif
-endif # patchelf
+endif # ldd
-else # opam not found
+else # opam
-	echo "ERROR: non-opam installations not supported" >&2; exit 1
+	echo "ERROR: need opam" >&2; exit 1
 endif
 
 # Nuke objects built from OCaml. Useful when changing the OCaml compiler, for instance.

Makefile.autoconf.in

@@ -27,7 +27,6 @@ EMACS = @EMACS@
 ENABLE_OCAMLOPT_CUSTOM_CC = @ENABLE_OCAMLOPT_CUSTOM_CC@
 ENABLE_OCAML_BINANNOT = @ENABLE_OCAML_BINANNOT@
 exec_prefix = @exec_prefix@
-GMP_LIB_PATH = @GMP_LIB_PATH@
 GNU_SED = @GNU_SED@
 INFER_MAJOR = @INFER_MAJOR@
 INFER_MAN_LAST_MODIFIED = @INFER_MAN_LAST_MODIFIED@
@@ -40,6 +39,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 IS_FACEBOOK_TREE = @IS_FACEBOOK_TREE@
 IS_RELEASE_TREE = @IS_RELEASE_TREE@
 JAVAC = @JAVAC@
+LDD = @LDD@
 LDFLAGS = @LDFLAGS@
 libdir = @libdir@
 # override in your `make` command to make the install relocatable
@@ -53,7 +53,6 @@ MKDIR_P_CMD = case "@MKDIR_P@" in \
     *) printf "@MKDIR_P@\n";; \
     esac
 MKDIR_P = $(shell $(MKDIR_P_CMD))
-MPFR_LIB_PATH = @MPFR_LIB_PATH@
 MVN = @MVN@
 NCPU = @NCPU@
 NDKBUILD = @NDKBUILD@

configure.ac

@@ -346,26 +346,14 @@ AC_CHECK_TOOL([BREW], [brew], [no])
 AC_ARG_VAR([SDKROOT], [path to the OSX platform SDK used by clang])
 AC_SUBST([SDKROOT])
 
-AC_CHECK_TOOL([PATCHELF], [patchelf], [no])
-AC_SUBST([PATCHELF])
 AC_CHECK_TOOL([INSTALL_NAME_TOOL], [install_name_tool], [no])
 AC_SUBST([INSTALL_NAME_TOOL])
+AC_CHECK_TOOL([LDD], [ldd], [no])
+AC_SUBST([LDD])
 AC_CHECK_TOOL([OTOOL], [otool], [no])
 AC_SUBST([OTOOL])
-
+AC_CHECK_TOOL([PATCHELF], [patchelf], [no])
-# look for the location of various libraries, needed to create relocatable installations of infer
+AC_SUBST([PATCHELF])
-
-AC_ARG_VAR([MPFR_LIB_PATH], [path to libmpfr.so or libmpfr.dylib])
-AC_MSG_CHECKING([where to find libmpfr])
-AS_IF([test "x$MPFR_LIB_PATH" = "x"], [MPFR_LIB_PATH=no])
-AC_MSG_RESULT([$MPFR_LIB_PATH])
-AC_SUBST([MPFR_LIB_PATH])
-
-AC_MSG_CHECKING([where to find libgmp])
-AC_ARG_VAR([GMP_LIB_PATH], [path to libgmp.so or libgmp.dylib])
-AS_IF([test "x$GMP_LIB_PATH" = "x"], [GMP_LIB_PATH=no])
-AC_MSG_RESULT([$GMP_LIB_PATH])
-AC_SUBST([GMP_LIB_PATH])
 
 AC_CHECK_INFER_MAN_LAST_MODIFIED()
 

scripts/create_binary_release.sh

@@ -42,8 +42,14 @@ rm -fr "$RELEASE_NAME"
 eval $(opam env)
 touch .release
 ./autogen.sh
-./configure --prefix="/$RELEASE_NAME"
+./configure \
-make -j "$JOBS" install-with-libs BUILD_MODE=opt DESTDIR="$ROOT_DIR" libdir_relative_to_bindir=../lib
+    --prefix="/$RELEASE_NAME"
+
+make -j "$JOBS" \
+    install-with-libs \
+    BUILD_MODE=opt \
+    DESTDIR="$ROOT_DIR" \
+    libdir_relative_to_bindir=../lib
 popd
 
 if [ "$DRYRUN" = "no" ]; then