diff --git a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch index 1bf93c7ad..394e0b346 100644 --- a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch +++ b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch @@ -1,6 +1,31 @@ +diff -ruN ParMGridGen-1.0_orig/Makefile ParMGridGen-1.0/Makefile +--- ParMGridGen-1.0_orig/Makefile 2017-04-04 15:02:44.020713666 +0200 ++++ ParMGridGen-1.0/Makefile 2017-04-04 15:21:48.582647336 +0200 +@@ -1,16 +1,21 @@ + default: ++ (mkdir bin) + (cd MGridGen ; make) + + serial: ++ (mkdir bin) + (cd MGridGen ; make) + + parallel: ++ (mkdir bin) + (cd MGridGen ; make) + (cd ParMGridGen ; make) + clean: ++ (mkdir bin) + (cd MGridGen ; make clean) + (cd ParMGridGen ; make clean ) + + realclean: ++ (mkdir bin) + (cd MGridGen ; make realclean ) + (cd ParMGridGen ; make realclean ) diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in ---- ParMGridGen-1.0_orig/Makefile.in 2001-12-04 16:30:33.000000000 -0800 -+++ ParMGridGen-1.0/Makefile.in 2013-08-22 20:07:33.491171127 -0700 +--- ParMGridGen-1.0_orig/Makefile.in 2017-04-04 15:02:44.012713543 +0200 ++++ ParMGridGen-1.0/Makefile.in 2017-04-04 15:06:00.159742074 +0200 @@ -1,6 +1,6 @@ #-------------------------------------------------------------------------- # Which make to use @@ -18,6 +43,15 @@ diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in # Which loader to use LD = cc +@@ -22,7 +22,7 @@ + LDOPTIONS = -O3 + + # Where to put the executable +-BINDIR = ../.. ++BINDIR = ../../bin + + # Additional libraries + DMALLOCDIR = /usr/local @@ -33,22 +33,25 @@ # In which directories to look for any additional libraries diff --git a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin index 29a9db97c..2f793fb40 100644 --- a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin +++ b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin @@ -79,8 +79,8 @@ diff -ruN ParMGridGen-1.0_orig/MGridGen/Programs/Makefile ParMGridGen-1.0/MGridG ifeq ($(ddmalloc),yes) DEBUGFLAGS := $(DEBUGFLAGS) -DDMALLOC -DDEBUG diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in ---- ParMGridGen-1.0_orig/Makefile.in 2011-12-24 13:54:44.000000000 -0500 -+++ ParMGridGen-1.0/Makefile.in 2011-12-24 13:49:26.000000000 -0500 +--- ParMGridGen-1.0_orig/Makefile.in 2001-12-05 01:30:33.000000000 +0100 ++++ ParMGridGen-1.0/Makefile.in 2017-04-04 15:36:04.695980033 +0200 @@ -1,6 +1,6 @@ #-------------------------------------------------------------------------- # Which make to use @@ -98,6 +98,15 @@ diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in # Which loader to use LD = cc +@@ -22,7 +22,7 @@ + LDOPTIONS = -O3 + + # Where to put the executable +-BINDIR = ../.. ++BINDIR = ../../bin + + # Additional libraries + DMALLOCDIR = /usr/local @@ -33,22 +33,25 @@ # In which directories to look for any additional libraries @@ -129,3 +138,28 @@ diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in #-------------------------------------------------------------------------- # +diff -ruN ParMGridGen-1.0_orig/Makefile ParMGridGen-1.0/Makefile +--- ParMGridGen-1.0_orig/Makefile 2001-11-09 00:41:22.000000000 +0100 ++++ ParMGridGen-1.0/Makefile 2017-04-04 14:51:04.033914737 +0200 +@@ -1,16 +1,21 @@ + default: ++ (mkdir bin) + (cd MGridGen ; make) + + serial: ++ (mkdir bin) + (cd MGridGen ; make) + + parallel: ++ (mkdir bin) + (cd MGridGen ; make) + (cd ParMGridGen ; make) + clean: ++ (mkdir bin) + (cd MGridGen ; make clean) + (cd ParMGridGen ; make clean ) + + realclean: ++ (mkdir bin) + (cd MGridGen ; make realclean ) + (cd ParMGridGen ; make realclean ) diff --git a/ThirdParty/rpmBuild/SOURCES/ParaView-4.4.0.patch_darwin b/ThirdParty/rpmBuild/SOURCES/ParaView-4.4.0.patch_darwin new file mode 100644 index 000000000..3d1d8ce4b --- /dev/null +++ b/ThirdParty/rpmBuild/SOURCES/ParaView-4.4.0.patch_darwin @@ -0,0 +1,12 @@ +diff -ruN ParaView-4.3.1_orig/Applications/ParaView-4.3.1_extra_install_Darwin.cmake ParaView-4.3.1/Applications/ParaView-4.3.1_extra_install_Darwin.cmake +--- ParaView-4.3.1_orig/Applications/ParaView-4.3.1_extra_install_Darwin.cmake 1969-12-31 19:00:00.000000000 -0500 ++++ ParaView-4.3.1/Applications/ParaView-4.3.1_extra_install_Darwin.cmake 2013-10-02 19:00:00.000000000 -0400 +@@ -0,0 +1,8 @@ ++# ++# Additional install rules for Mac OS X platforms ++# ++INSTALL (DIRECTORY buildObj/bin/paraview.app ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ++ USE_SOURCE_PERMISSIONS ++ COMPONENT Runtime) ++ diff --git a/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 b/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 index dbbcb47aa..4a82e7fcf 100644 --- a/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 +++ b/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 @@ -1,13 +1,13 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/config.gnu.to.star ---- libccmio-2.6.1_orig/config/config.gnu.to.star 2007-12-17 18:32:03.000000000 -0500 -+++ libccmio-2.6.1/config/config.gnu.to.star 2010-12-18 14:50:35.000000000 -0500 +--- libccmio-2.6.1_orig/config/config.gnu.to.star 2007-12-18 00:32:03.000000000 +0100 ++++ libccmio-2.6.1/config/config.gnu.to.star 2017-04-04 13:41:35.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # $Id: config.gnu.to.star,v 1.4 2006/06/05 21:12:16 geoffp Exp $ -@@ -34,6 +34,12 @@ +@@ -34,6 +34,13 @@ x86_64-unknown-linux-gnu-null) echo linux64_2.4-x86-glibc_2.2.5 ;; ppc64-unknown-linux-gnu-null) echo linux64_2.6-pwr4-glibc_2.3.3 ;; i386-apple-darwin8-null) echo i386-apple-darwin8 ;; @@ -17,6 +17,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co + i386-apple-darwin13-null) echo i386-apple-darwin13 ;; + i386-apple-darwin14-null) echo i386-apple-darwin14 ;; + i386-apple-darwin15-null) echo i386-apple-darwin15 ;; ++ i386-apple-darwin16-null) echo i386-apple-darwin16 ;; *) echo unknown ;; esac @@ -30,15 +31,15 @@ diff -ruN libccmio-2.6.1_orig/config/config.guess libccmio-2.6.1/config/config.g # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config.system ---- libccmio-2.6.1_orig/config/config.system 2008-02-25 22:07:16.000000000 -0500 -+++ libccmio-2.6.1/config/config.system 2010-12-18 14:51:34.000000000 -0500 +--- libccmio-2.6.1_orig/config/config.system 2008-02-26 04:07:16.000000000 +0100 ++++ libccmio-2.6.1/config/config.system 2017-04-04 13:42:15.000000000 +0200 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash # $Id: config.system,v 1.2 2005/09/29 22:19:19 geoffp Exp $ -@@ -87,6 +87,27 @@ +@@ -87,6 +87,30 @@ i386-apple-darwin8.11.1) echo i386-apple-darwin8 ;; @@ -62,6 +63,9 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config. + + i386-apple-darwin15.* ) + echo i386-apple-darwin15 ;; ++ ++ i386-apple-darwin16.* ) ++ echo i386-apple-darwin16 ;; + *) echo unknown diff --git a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec index a8c47a8da..b62d21d0f 100644 --- a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec +++ b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec @@ -105,6 +105,7 @@ Patch0: libccmio-2.6.1.patch_0 [ ! -d config/i386-apple-darwin13 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin13 [ ! -d config/i386-apple-darwin14 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin14 [ ! -d config/i386-apple-darwin15 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin15 + [ ! -d config/i386-apple-darwin16 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin16 %endif # Warning: # 1: The name of the ADF library will be renamed to libadf_ccmio since this