diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rwxr-xr-x | configure | 11 |
3 files changed, 21 insertions, 10 deletions
@@ -1,5 +1,17 @@ 2012-04-20 Kaz Kylheku <kaz@kylheku.com> + Fixes for configuring and building in a separate directory. + + * configure: MPI is now extracted and patched in the build directory, + not in the source directory. + + * Makefile (CFLAGS): Refer to mpi headers relative to current + directory, not $(top_srcdir). + (repatch): Run MPI repatching steps in correct directory. + (clean): Remove extracted MPI from build directory. + +2012-04-20 Kaz Kylheku <kaz@kylheku.com> + Version 65 * txr.c (version): Bumped. @@ -30,7 +30,7 @@ include config.make CFLAGS := -I. -I$(top_srcdir) $(LANG_FLAGS) $(DIAG_FLAGS) \ $(OPT_FLAGS) $(DBG_FLAGS) $(PLATFORM_FLAGS) $(EXTRA_FLAGS) -CFLAGS += -I$(top_srcdir)/mpi-$(mpi_version) +CFLAGS += -Impi-$(mpi_version) CFLAGS := $(filter-out $(REMOVE_FLAGS),$(CFLAGS)) ifneq ($(subst g++,@,$(notdir $(CC))),$(notdir $(CC))) @@ -81,13 +81,13 @@ clean: .PHONY: repatch repatch: - cd $(top_srcdir)/mpi-$(mpi_version); quilt pop -af - cd $(top_srcdir)/mpi-$(mpi_version); quilt push -a + cd mpi-$(mpi_version); quilt pop -af + cd mpi-$(mpi_version); quilt push -a .PHONY: distclean distclean: clean rm -f config.h config.make config.log - rm -rf $(top_srcdir)/mpi-$(mpi_version) + rm -rf mpi-$(mpi_version) .PHONY: depend depend: @@ -1288,20 +1288,19 @@ apply_patches() printf "Extracting MPI ... " -if [ -e $top_srcdir/mpi-${mpi_version} ] ; then +if [ -e mpi-${mpi_version} ] ; then printf "already extracted\n" else - tar -C $top_srcdir -xzf $top_srcdir/mpi-${mpi_version}.tar.gz + tar -xzf $top_srcdir/mpi-${mpi_version}.tar.gz printf "\n" printf "Symlinking MPI patches ...\n" - ln -sf ../mpi-patches \ - $top_srcdir/mpi-${mpi_version}/patches + ln -sf $top_srcdir/mpi-patches mpi-${mpi_version}/patches printf "Applying MPI patches ...\n" if [ -n "$have_quilt" ] ; then - ( cd $top_srcdir/mpi-${mpi_version}/patches ; + ( cd mpi-${mpi_version}/patches ; if [ -e series ] ; then quilt push -a ; else echo "no patches" ; fi ) else - ( cd $top_srcdir/mpi-${mpi_version} ; + ( cd mpi-${mpi_version} ; apply_patches ) fi fi |