Mercurial > mxe-octave

changeset 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 30806338a509
children 1d86cb0348ff 4b0004dc5941
files Makefile.in src/build-binutils.mk src/build-bison.mk src/build-m4.mk src/build-xz.mk src/default-octave-1-inttypes.patch
diffstat 6 files changed, 29 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Fri Jul 08 07:51:57 2016 -0400
+++ b/Makefile.in	Fri Jul 08 10:24:12 2016 -0400
@@ -241,6 +241,7 @@
 endif
 
 STAMP_DIR  := $(TOP_BUILD_DIR)/installed-packages
+BUILT_PKGS_DIR := $(TOP_BUILD_DIR)/built-packages
 MSYS_INFO_DIR := $(TOP_BUILD_DIR)/msys-info
 LOG_DIR    := $(TOP_BUILD_DIR)/log
 TIMESTAMP  := $(shell date +%Y%m%d_%H%M%S)
@@ -601,15 +602,20 @@
     fi
 endef
 
-define INSTALL_DESTDIR
-    if [ -d '$(1)$(ROOT_PREFIX)' ]; then \
-        (cd '$(1)$(ROOT_PREFIX)' && tar c .) | (cd '$(ROOT_PREFIX)' && tar x -p); \
+define CREATE_PKG
+    [ -d '$(BUILT_PKGS_DIR)' ] || mkdir -p '$(BUILT_PKGS_DIR)'; \
+    if [ -d '$(2)$(ROOT_PREFIX)' ]; then \
+        (cd '$(2)$(ROOT_PREFIX)' && tar caf '$(BUILT_PKGS_DIR)/$(1).tar.xz' .); \
     fi; \
-    if [ "$(ROOT_PREFIX)" != "$(CMAKE_ROOT_PREFIX)" ] && [ -d '$(1)$(CMAKE_ROOT_PREFIX)' ]; then \
-        (cd '$(1)$(CMAKE_ROOT_PREFIX)' && tar c .) | (cd '$(ROOT_PREFIX)' && tar x -p); \
+    if [ "$(ROOT_PREFIX)" != "$(CMAKE_ROOT_PREFIX)" ] && [ -d '$(2)$(CMAKE_ROOT_PREFIX)' ]; then \
+        (cd '$(2)$(CMAKE_ROOT_PREFIX)' && tar caf '$(BUILT_PKGS_DIR)/$(1).tar.xz' .); \
     fi
 endef
 
+define INSTALL_PKG_TO_DESTDIR
+    (cd '$(ROOT_PREFIX)' && tar xaf '$(BUILT_PKGS_DIR)/$(1).tar.xz')
+endef
+
 define OCTAVE_FORGE_PKG_COMPILE
   if [ -d '$(1)/src' ]; then \
     if [ -f '$(1)/src/configure' ]; then \
@@ -735,10 +741,11 @@
 	    $$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test,$(2)-install)
 	    if [ -d '$(2)-install' ]; then \
                 $(call GENERATE_FILE_LIST,$(1),$(2)-install); \
-                $(call INSTALL_DESTDIR,$(2)-install); \
+                $(call CREATE_PKG,$(1),$(2)-install); \
+                $(call INSTALL_PKG_TO_DESTDIR,$(1),$(2)-install); \
 		(du -k -d 0 '$(2)-install' 2>/dev/null || du -k --max-depth 0 '$(2)-install') | \
 			$(SED) -n 's/^\(\S*\).*/du: \1 KiB/p'; \
-		rm -rfv  '$(2)-install'; \
+		[ '$(KEEP_BUILD)' = '1' ] || rm -rfv  '$(2)-install'; \
 	    fi
 	    (du -k -d 0 '$(2)' 2>/dev/null || du -k --max-depth 0 '$(2)') | $(SED) -n 's/^\(\S*\).*/du: \1 KiB/p'
 	    [ '$(KEEP_BUILD)' = '1' ] || rm -rfv  '$(2)'
@@ -758,6 +765,10 @@
 	rm -f Makefile cmake-toolchain-file.stamp
 	rm -f tools/set-mxe-env.sh
 
+.PHONY: realclean
+realclean: clean
+	rm -rf $(BUILT_PKGS_DIR)
+
 .PHONY: clean-pkg
 clean-pkg:
 	rm -f $(patsubst %,'%', \
--- a/src/build-binutils.mk	Fri Jul 08 07:51:57 2016 -0400
+++ b/src/build-binutils.mk	Fri Jul 08 10:24:12 2016 -0400
@@ -14,12 +14,12 @@
 ifneq ($(MXE_NATIVE_BUILD),yes)
 ifneq ($(ENABLE_WINDOWS_64),yes)
   define $(PKG)_POST_BUILD
-    $(INSTALL) -d '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)'
-    mv $(addprefix $(HOST_PREFIX)/bin/, ar as dlltool ld ld.bfd nm objcopy objdump ranlib strip) '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)'
+    $(INSTALL) -d '$(3)/$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)'
+    mv $(addprefix $(3)/$(HOST_PREFIX)/bin/, ar as dlltool ld ld.bfd nm objcopy objdump ranlib strip) '$(3)/$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)'
   endef
 else
   define $(PKG)_POST_BUILD
-    rm $(addprefix $(HOST_PREFIX)/bin/, ar as dlltool ld ld.bfd nm objcopy objdump ranlib strip)
+    rm $(addprefix $(3)/$(HOST_PREFIX)/bin/, ar as dlltool ld ld.bfd nm objcopy objdump ranlib strip)
   endef
 endif
 endif
@@ -53,12 +53,11 @@
 
 define $(PKG)_BUILD
     # install config.guess for general use
-    $(INSTALL) -d '$(BUILD_TOOLS_PREFIX)/bin'
-    $(INSTALL) -m755 '$(1)/config.guess' '$(BUILD_TOOLS_PREFIX)/bin/'
+    $(INSTALL) -d '$(3)/$(BUILD_TOOLS_PREFIX)/bin'
+    $(INSTALL) -m755 '$(1)/config.guess' '$(3)/$(BUILD_TOOLS_PREFIX)/bin/'
 
-    # install target-specific autotools config file
-    $(INSTALL) -d '$(HOST_PREFIX)/share'
-    echo "ac_cv_build=`$(1)/config.guess`" > '$(HOST_PREFIX)/share/config.site'
+    $(INSTALL) -d '$(3)/$(HOST_PREFIX)/share'
+    echo "ac_cv_build=`$(1)/config.guess`" > '$(3)/$(HOST_PREFIX)/share/config.site'
 
     cd '$(1)' && ./configure \
         $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \
@@ -70,7 +69,7 @@
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-werror
     $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)'
 
     $($(PKG)_POST_BUILD)
 endef
--- a/src/build-bison.mk	Fri Jul 08 07:51:57 2016 -0400
+++ b/src/build-bison.mk	Fri Jul 08 10:24:12 2016 -0400
@@ -20,5 +20,5 @@
     cd    '$(1).build' && '$(1)/configure' \
         --prefix='$(BUILD_TOOLS_PREFIX)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
+    $(MAKE) -C '$(1).build' -j 1 install DESTDIR='$(3)'
 endef
--- a/src/build-m4.mk	Fri Jul 08 07:51:57 2016 -0400
+++ b/src/build-m4.mk	Fri Jul 08 10:24:12 2016 -0400
@@ -20,5 +20,5 @@
     cd    '$(1).build' && '$(1)/configure' \
         --prefix='$(BUILD_TOOLS_PREFIX)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
+    $(MAKE) -C '$(1).build' -j 1 install DESTDIR='$(3)'
 endef
--- a/src/build-xz.mk	Fri Jul 08 07:51:57 2016 -0400
+++ b/src/build-xz.mk	Fri Jul 08 10:24:12 2016 -0400
@@ -21,5 +21,5 @@
         --prefix='$(BUILD_TOOLS_PREFIX)' \
         --disable-threads \
         --disable-nls
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)'
 endef
--- a/src/default-octave-1-inttypes.patch	Fri Jul 08 07:51:57 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-diff -ur octave-4.1.0+.orig/liboctave/util/oct-inttypes.cc octave-4.1.0+/liboctave/util/oct-inttypes.cc
---- octave-4.1.0+.orig/liboctave/util/oct-inttypes.cc	2016-06-17 14:01:56.000000000 -0400
-+++ octave-4.1.0+/liboctave/util/oct-inttypes.cc	2016-06-17 19:52:03.943017663 -0400
-@@ -105,7 +105,31 @@
- 
- #if defined (OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED)
- 
--#define DEFINE_OCTAVE_LONG_DOUBLE_CMP_OP_TEMPLATES(T) \
-+typedef unsigned short fpucw_t; /* glibc calls this fpu_control_t */
-+
-+# define FPU_PC_MASK 0x0300
-+# define FPU_PC_DOUBLE 0x200    /* glibc calls this _FPU_DOUBLE */
-+# define FPU_PC_EXTENDED 0x300  /* glibc calls this _FPU_EXTENDED */
-+
-+# define GET_FPUCW() \
-+  ({ fpucw_t _cw;                                               \
-+     __asm__ __volatile__ ("fnstcw %0" : "=m" (*&_cw));         \
-+     _cw;                                                       \
-+   })
-+# define SET_FPUCW(word) \
-+  (void)({ fpucw_t _ncw = (word);                               \
-+           __asm__ __volatile__ ("fldcw %0" : : "m" (*&_ncw));  \
-+         })
-+
-+# define DECL_LONG_DOUBLE_ROUNDING \
-+  fpucw_t oldcw;
-+# define BEGIN_LONG_DOUBLE_ROUNDING() \
-+  (void)(oldcw = GET_FPUCW (),                                  \
-+         SET_FPUCW ((oldcw & ~FPU_PC_MASK) | FPU_PC_EXTENDED))
-+# define END_LONG_DOUBLE_ROUNDING() \
-+  SET_FPUCW (oldcw)
-+
-+#define DEFINE_OCTAVE_LONG_DOUBLE_CMP_OP_TEMPLATES(T)   \
-   template <typename xop> \
-   bool \
-   octave_int_cmp_op::external_mop (double x, T y) \