Mercurial > mxe-octave

comparison Makefile.in @ 4172:4117faf76988

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
default-octave-1-inttypes.patch: Remove obsolete patch file.
author John W. Eaton <jwe@octave.org>
date Fri, 08 Jul 2016 10:24:12 -0400
parents 4556ee171f27
children 4b0004dc5941
comparison
equal deleted inserted replaced
4171:30806338a509 4172:4117faf76988
239 ifneq ($(MXE_SYSTEM),msvc) 239 ifneq ($(MXE_SYSTEM),msvc)
240 BUILD_TOOLS := $(filter-out build-msvctools, $(BUILD_TOOLS)) 240 BUILD_TOOLS := $(filter-out build-msvctools, $(BUILD_TOOLS))
241 endif 241 endif
242 242
243 STAMP_DIR := $(TOP_BUILD_DIR)/installed-packages 243 STAMP_DIR := $(TOP_BUILD_DIR)/installed-packages
244 BUILT_PKGS_DIR := $(TOP_BUILD_DIR)/built-packages
244 MSYS_INFO_DIR := $(TOP_BUILD_DIR)/msys-info 245 MSYS_INFO_DIR := $(TOP_BUILD_DIR)/msys-info
245 LOG_DIR := $(TOP_BUILD_DIR)/log 246 LOG_DIR := $(TOP_BUILD_DIR)/log
246 TIMESTAMP := $(shell date +%Y%m%d_%H%M%S) 247 TIMESTAMP := $(shell date +%Y%m%d_%H%M%S)
247 PKG_DIR := $(TOP_DIR)/pkg 248 PKG_DIR := $(TOP_DIR)/pkg
248 TMP_DIR = $(TOP_BUILD_DIR)/tmp-$(1) 249 TMP_DIR = $(TOP_BUILD_DIR)/tmp-$(1)
599 if [ "$(ROOT_PREFIX)" != "$(CMAKE_ROOT_PREFIX)" ] && [ -d '$(2)$(CMAKE_ROOT_PREFIX)' ]; then \ 600 if [ "$(ROOT_PREFIX)" != "$(CMAKE_ROOT_PREFIX)" ] && [ -d '$(2)$(CMAKE_ROOT_PREFIX)' ]; then \
600 ($(call GENERATE_DIR_FILE_LIST,$(2)$(CMAKE_ROOT_PREFIX))) >> '$(STAMP_DIR)/$(1).pkg'; \ 601 ($(call GENERATE_DIR_FILE_LIST,$(2)$(CMAKE_ROOT_PREFIX))) >> '$(STAMP_DIR)/$(1).pkg'; \
601 fi 602 fi
602 endef 603 endef
603 604
604 define INSTALL_DESTDIR 605 define CREATE_PKG
605 if [ -d '$(1)$(ROOT_PREFIX)' ]; then \ 606 [ -d '$(BUILT_PKGS_DIR)' ] || mkdir -p '$(BUILT_PKGS_DIR)'; \
606 (cd '$(1)$(ROOT_PREFIX)' && tar c .) | (cd '$(ROOT_PREFIX)' && tar x -p); \ 607 if [ -d '$(2)$(ROOT_PREFIX)' ]; then \
608 (cd '$(2)$(ROOT_PREFIX)' && tar caf '$(BUILT_PKGS_DIR)/$(1).tar.xz' .); \
607 fi; \ 609 fi; \
608 if [ "$(ROOT_PREFIX)" != "$(CMAKE_ROOT_PREFIX)" ] && [ -d '$(1)$(CMAKE_ROOT_PREFIX)' ]; then \ 610 if [ "$(ROOT_PREFIX)" != "$(CMAKE_ROOT_PREFIX)" ] && [ -d '$(2)$(CMAKE_ROOT_PREFIX)' ]; then \
609 (cd '$(1)$(CMAKE_ROOT_PREFIX)' && tar c .) | (cd '$(ROOT_PREFIX)' && tar x -p); \ 611 (cd '$(2)$(CMAKE_ROOT_PREFIX)' && tar caf '$(BUILT_PKGS_DIR)/$(1).tar.xz' .); \
610 fi 612 fi
613 endef
614
615 define INSTALL_PKG_TO_DESTDIR
616 (cd '$(ROOT_PREFIX)' && tar xaf '$(BUILT_PKGS_DIR)/$(1).tar.xz')
611 endef 617 endef
612 618
613 define OCTAVE_FORGE_PKG_COMPILE 619 define OCTAVE_FORGE_PKG_COMPILE
614 if [ -d '$(1)/src' ]; then \ 620 if [ -d '$(1)/src' ]; then \
615 if [ -f '$(1)/src/configure' ]; then \ 621 if [ -f '$(1)/src/configure' ]; then \
733 $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(MXE_SYSTEM)-$(1)-*.patch)), 739 $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(MXE_SYSTEM)-$(1)-*.patch)),
734 (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) 740 (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
735 $$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test,$(2)-install) 741 $$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test,$(2)-install)
736 if [ -d '$(2)-install' ]; then \ 742 if [ -d '$(2)-install' ]; then \
737 $(call GENERATE_FILE_LIST,$(1),$(2)-install); \ 743 $(call GENERATE_FILE_LIST,$(1),$(2)-install); \
738 $(call INSTALL_DESTDIR,$(2)-install); \ 744 $(call CREATE_PKG,$(1),$(2)-install); \
745 $(call INSTALL_PKG_TO_DESTDIR,$(1),$(2)-install); \
739 (du -k -d 0 '$(2)-install' 2>/dev/null || du -k --max-depth 0 '$(2)-install') | \ 746 (du -k -d 0 '$(2)-install' 2>/dev/null || du -k --max-depth 0 '$(2)-install') | \
740 $(SED) -n 's/^\(\S*\).*/du: \1 KiB/p'; \ 747 $(SED) -n 's/^\(\S*\).*/du: \1 KiB/p'; \
741 rm -rfv '$(2)-install'; \ 748 [ '$(KEEP_BUILD)' = '1' ] || rm -rfv '$(2)-install'; \
742 fi 749 fi
743 (du -k -d 0 '$(2)' 2>/dev/null || du -k --max-depth 0 '$(2)') | $(SED) -n 's/^\(\S*\).*/du: \1 KiB/p' 750 (du -k -d 0 '$(2)' 2>/dev/null || du -k --max-depth 0 '$(2)') | $(SED) -n 's/^\(\S*\).*/du: \1 KiB/p'
744 [ '$(KEEP_BUILD)' = '1' ] || rm -rfv '$(2)' 751 [ '$(KEEP_BUILD)' = '1' ] || rm -rfv '$(2)'
745 ,) 752 ,)
746 [ -d '$(STAMP_DIR)' ] || mkdir -p '$(STAMP_DIR)' 753 [ -d '$(STAMP_DIR)' ] || mkdir -p '$(STAMP_DIR)'
755 rm -rf $(STAMP_DIR) $(MSYS_INFO_DIR) $(LOG_DIR) 762 rm -rf $(STAMP_DIR) $(MSYS_INFO_DIR) $(LOG_DIR)
756 rm -rf $(MSYS_BASE_DIR) $(MSYS_EXTENSION_DIR) $(NOTEPAD_BASE_DIR) 763 rm -rf $(MSYS_BASE_DIR) $(MSYS_EXTENSION_DIR) $(NOTEPAD_BASE_DIR)
757 rm -rf native-tools cross-tools octave gnuplot 764 rm -rf native-tools cross-tools octave gnuplot
758 rm -f Makefile cmake-toolchain-file.stamp 765 rm -f Makefile cmake-toolchain-file.stamp
759 rm -f tools/set-mxe-env.sh 766 rm -f tools/set-mxe-env.sh
767
768 .PHONY: realclean
769 realclean: clean
770 rm -rf $(BUILT_PKGS_DIR)
760 771
761 .PHONY: clean-pkg 772 .PHONY: clean-pkg
762 clean-pkg: 773 clean-pkg:
763 rm -f $(patsubst %,'%', \ 774 rm -f $(patsubst %,'%', \
764 $(filter-out \ 775 $(filter-out \