Diff charm-6.5.1-r3 with a charm-6.6.0

/usr/portage/sys-cluster/charm/charm-6.6.0.ebuild 2017-02-28 22:50:00.000000000 +0300
3 3

  
4 4
EAPI=5
5 5

  
6
FORTRAN_STANDARD="90"
6 7
PYTHON_COMPAT=( python2_7 )
7 8

  
8
inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-any-r1
9
inherit eutils flag-o-matic fortran-2 multilib multiprocessing python-any-r1 toolchain-funcs
9 10

  
10 11
DESCRIPTION="Message-passing parallel language and runtime system"
11 12
HOMEPAGE="http://charm.cs.uiuc.edu/"
......
35 36
	cmkopt? ( !charmdebug !charmtracing )
36 37
	charmproduction? ( !charmdebug !charmtracing )"
37 38

  
38
FORTRAN_STANDARD="90"
39

  
40 39
pkg_setup() {
41 40
	use doc && python-any-r1_pkg_setup
42 41
}
......
75 74

  
76 75
src_prepare() {
77 76
	sed \
78
		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
77
		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \
78
		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
79
		-e "/CMK_CF90/s:\`which f90.*$::g" \
79 80
		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
80 81
		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
81 82
		-e '/CMK_F90_MODINC/s:-p:-I:g' \
82 83
		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
83
		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
84
		-i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die
85
	sed \
86
		-e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
87
		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
88
		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
89
		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
90
		-i src/arch/common/*.sh || die
84 91

  
85 92
	sed \
86 93
		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
......
92 99
		-e "s:-o charmd:${LDFLAGS} &:g" \
93 100
		-i \
94 101
		src/scripts/Makefile \
95
		src/arch/net/charmrun/Makefile || die
102
		src/util/charmrun-src/Makefile || die
96 103

  
97 104
	# CMK optimization
98 105
	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
......
100 107
	# Fix QA notice. Filed report with upstream.
101 108
	append-cflags -DALLOCA_H
102 109

  
103
	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
104
	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
105
	epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
106 110
	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
107 111
	epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch"
108
	epatch "${FILESDIR}/charm-6.5.1-static-library-fix.patch"
109 112
}
110 113

  
111 114
src_compile() {
112
	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}"
115
	local build_version="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '')"
116
	local build_options="$(get_opts)"
117
	#build only accepts -j from MAKEOPTS
118
	local build_commandline="${build_version} ${build_options} -j$(makeopts_jobs)"
113 119

  
114 120
	# Build charmm++ first.
115
	einfo "running ./build charm++ ${mybuildoptions}"
116
	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
121
	einfo "running ./build charm++ ${build_commandline}"
122
	./build charm++ ${build_commandline} || die "Failed to build charm++"
117 123

  
118 124
	# make pdf/html docs
119 125
	if use doc; then
......
158 164
		doins "${i}"
159 165
	done
160 166

  
161
	# Install static libs. Charm has a lot of .o "libs" that it requires at
162
	# runtime.
163
	if use static-libs; then
164
		for i in lib/*.{a,o}; do
165
			if [[ -L ${i} ]]; then
166
				i=$(readlink -e "${i}") || die
167
			fi
168
			dolib "${i}"
169
		done
170
	fi
171

  
172
	# Install shared libs.
173
	for i in lib_so/*; do
167
	# Install libs incl. charm objects
168
	for i in lib*/*.{so,o,a}; do
169
		[[ ${i} = *.a ]] && use !static-libs && continue
174 170
		if [[ -L ${i} ]]; then
175 171
			i=$(readlink -e "${i}") || die
176 172
		fi
177
		dolib.so "${i}"
173
		[[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}"
178 174
	done
179 175

  
180 176
	# Basic docs.
......
190 186
			die "Failed to fix examples"
191 187
		insinto /usr/share/doc/${PF}/examples
192 188
		doins -r examples/charm++/*
189
		docompress -x /usr/share/doc/${PF}/examples
193 190
	fi
194 191

  
195 192
	# Install pdf/html docs
Thank you!