exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge commit '084a033843ed2e8693454de9760c8cb98952bf72' into nextRelease

Browse source
This commit is contained in:
Hrvoje Jasak 2018-02-09 13:48:18 +00:00
commit ec83275923
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_darwin vendored
View file

@ -129,7 +129,7 @@ diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in
# What archiving to use # What archiving to use
-AR = ar rv -AR = ar rv
+AR = gcc -dynamiclib -undefined dynamic_lookup -shared -o +AR = clang -dynamiclib -headerpad_max_install_names -undefined dynamic_lookup -shared -o
# What to use for indexing the archive # What to use for indexing the archive
#RANLIB = ranlib #RANLIB = ranlib

8
ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 vendored
View file

@ -7,7 +7,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co
# $Id: config.gnu.to.star,v 1.4 2006/06/05 21:12:16 geoffp Exp $ # $Id: config.gnu.to.star,v 1.4 2006/06/05 21:12:16 geoffp Exp $
@@ -34,6 +34,13 @@ @@ -34,6 +34,14 @@
x86_64-unknown-linux-gnu-null) echo linux64_2.4-x86-glibc_2.2.5 ;; 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 ;; ppc64-unknown-linux-gnu-null) echo linux64_2.6-pwr4-glibc_2.3.3 ;;
i386-apple-darwin8-null) echo i386-apple-darwin8 ;; i386-apple-darwin8-null) echo i386-apple-darwin8 ;;
@ -18,6 +18,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co
+ i386-apple-darwin14-null) echo i386-apple-darwin14 ;; + i386-apple-darwin14-null) echo i386-apple-darwin14 ;;
+ i386-apple-darwin15-null) echo i386-apple-darwin15 ;; + i386-apple-darwin15-null) echo i386-apple-darwin15 ;;
+ i386-apple-darwin16-null) echo i386-apple-darwin16 ;; + i386-apple-darwin16-null) echo i386-apple-darwin16 ;;
+ i386-apple-darwin17-null) echo i386-apple-darwin17 ;;
*) echo unknown ;; *) echo unknown ;;
esac esac
@ -39,7 +40,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config.
# $Id: config.system,v 1.2 2005/09/29 22:19:19 geoffp Exp $ # $Id: config.system,v 1.2 2005/09/29 22:19:19 geoffp Exp $
@@ -87,6 +87,30 @@ @@ -87,6 +87,33 @@
i386-apple-darwin8.11.1) i386-apple-darwin8.11.1)
echo i386-apple-darwin8 ;; echo i386-apple-darwin8 ;;
@ -66,6 +67,9 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config.
+ +
+ i386-apple-darwin16.* ) + i386-apple-darwin16.* )
+ echo i386-apple-darwin16 ;; + echo i386-apple-darwin16 ;;
+
+ i386-apple-darwin17.* )
+ echo i386-apple-darwin17 ;;
+ +
*) *)
echo unknown echo unknown

1
ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec vendored
View file

@ -106,6 +106,7 @@ Patch0: libccmio-2.6.1.patch_0
[ ! -d config/i386-apple-darwin14 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin14 [ ! -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-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 [ ! -d config/i386-apple-darwin16 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin16
[ ! -d config/i386-apple-darwin17 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin17
%endif %endif
# Warning: # Warning:
# 1: The name of the ADF library will be renamed to libadf_ccmio since this # 1: The name of the ADF library will be renamed to libadf_ccmio since this