Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 887753 | Differences between
and this patch

Collapse All | Expand All

(-)/var/db/portage/local/sys-libs/ncurses/ncurses-6.4_p20230401.ebuild (-12 / +7 lines)
Lines 149-154 Link Here
149
	# bug #214642
149
	# bug #214642
150
	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
150
	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
151
151
152
	# bug #852665
153
	if [[ ${CHOST} == *-cygwin* ]]; then
154
		BUILD_CPPFLAGS+=" -DBUILDING_NCURSES"
155
	fi
156
152
	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
157
	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
153
	# Order matters here -- we want unicode/thread versions to come last so that the
158
	# Order matters here -- we want unicode/thread versions to come last so that the
154
	# binaries in /usr/bin support both wide and narrow.
159
	# binaries in /usr/bin support both wide and narrow.
Lines 177-183 Link Here
177
		echo "int main() {}" | \
182
		echo "int main() {}" | \
178
			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
183
			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
179
			|| lbuildflags="${dbuildflags}"
184
			|| lbuildflags="${dbuildflags}"
180
		lbuildflags=""
185
181
		# We can't re-use the multilib BUILD_DIR because we run outside of it.
186
		# We can't re-use the multilib BUILD_DIR because we run outside of it.
182
		BUILD_DIR="${WORKDIR}" \
187
		BUILD_DIR="${WORKDIR}" \
183
		CC=${BUILD_CC} \
188
		CC=${BUILD_CC} \
Lines 294-310 Link Here
294
src_compile() {
299
src_compile() {
295
	# See comments in src_configure.
300
	# See comments in src_configure.
296
	if ! has_version -b "~sys-libs/${P}:0" ; then
301
	if ! has_version -b "~sys-libs/${P}:0" ; then
297
		# We could possibly merge these two branches but opting to be
302
		BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext)
298
		# conservative when merging some of the Prefix changes.
299
300
		if [[ ${CHOST} == *-cygwin* ]] && ! multilib_is_native_abi ; then
301
			# We make 'tic$(x)' here, for Cygwin having x=".exe".
302
			BUILD_DIR="${WORKDIR}" \
303
				 do_compile cross -C progs all PROGS='tic$(x)'
304
		else
305
			BUILD_DIR="${WORKDIR}" \
306
				 do_compile cross -C progs tic
307
		fi
308
	fi
303
	fi
309
304
310
	multilib-minimal_src_compile
305
	multilib-minimal_src_compile

Return to bug 887753