From 4f4e65e194eef9e7f985299d066cfd1d4f0d7c76 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 22 Nov 2013 06:41:42 -0700 Subject: [PATCH] make installers: install required packages, first This change should fix a problem with the Mac OS X PPC build, where the "libsqlite3" shared library needs to be installed early. The same strategy is already used for Windows. Merge to v6.0 (cherry picked from commit 7b89225001452987e03f32dc1c4a65573d9d2ad8) --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5ff1eaef70..131ee5fbd8 100644 --- a/Makefile +++ b/Makefile @@ -417,13 +417,17 @@ distro-build-from-server: # Copy our local build into a "bundle/racket" build, dropping in the # process things that should not be in an installer (such as the "src" # directory). Then, replace the "collects" tree with the one from the -# server. Finally, install pre-built packages from the server: +# server. Install required packages next, because they may include +# packages that are needed kto make core functionality work right +# (which as the SQLite3 library). At last, install the selected packages +# from the server, and the run a post-adjustment script. bundle-from-server: rm -rf bundle mkdir -p bundle/racket $(RACKET) -l setup/unixstyle-install bundle racket bundle/racket $(RACKET) -l distro-build/unpack-collects http://$(SVR_PRT)/ - $(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(PKGS) $(REQUIRED_PKGS) + $(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(REQUIRED_PKGS) + $(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(PKGS) $(RACKET) -l setup/unixstyle-install post-adjust "$(SOURCE_MODE)" "$(PKG_SOURCE_MODE)" racket bundle/racket bundle-config: