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

Collapse All | Expand All

(-)freebsd-lib-6.2-r2.ebuild (-5 / +13 lines)
Lines 66-72 Link Here
66
	use nis || mymakeopts="${mymakeopts} NO_NIS= "
66
	use nis || mymakeopts="${mymakeopts} NO_NIS= "
67
	use gpib || mymakeopts="${mymakeopts} NO_GPIB= "
67
	use gpib || mymakeopts="${mymakeopts} NO_GPIB= "
68
68
69
	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= "
69
	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= NO_LIBC_R= NO_LIBPTHREAD="
70
70
71
	if [[ ${CTARGET} != ${CHOST} ]]; then
71
	if [[ ${CTARGET} != ${CHOST} ]]; then
72
		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
72
		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
Lines 85-91 Link Here
85
	${FILESDIR}/${PN}-6.2-gcc41.patch
85
	${FILESDIR}/${PN}-6.2-gcc41.patch
86
	${FILESDIR}/${PN}-6.2-dl_iterate_phdr.patch
86
	${FILESDIR}/${PN}-6.2-dl_iterate_phdr.patch
87
	${FILESDIR}/${PN}-6.2-as-needed.patch
87
	${FILESDIR}/${PN}-6.2-as-needed.patch
88
	${FILESDIR}/${PN}-6.2-sparc64.patch"
88
	${FILESDIR}/${PN}-6.2-sparc64.patch
89
	${FILESDIR}/${PN}-6.2-libthr.patch"
89
90
90
# Here we disable and remove source which we don't need or want
91
# Here we disable and remove source which we don't need or want
91
# In order:
92
# In order:
Lines 245-250 Link Here
245
		mkinstall || die "Install failed"
246
		mkinstall || die "Install failed"
246
	fi
247
	fi
247
248
249
	# Make libthr the default threading library. 
250
	dosym libthr.a /usr/lib/libpthread.a
251
	dosym libthr.so /usr/lib/libpthread.so
252
248
	# Don't install the rest of the configuration files if crosscompiling
253
	# Don't install the rest of the configuration files if crosscompiling
249
	[[ ${CTARGET} != ${CHOST} ]] && return 0
254
	[[ ${CTARGET} != ${CHOST} ]] && return 0
250
255
Lines 265-273 Link Here
265
	# Install ttys file
270
	# Install ttys file
266
	doins "etc.$(tc-arch-kernel)"/*
271
	doins "etc.$(tc-arch-kernel)"/*
267
272
268
	# Install a default libmap.conf that uses libthr by default
269
	doins "${FILESDIR}"/libmap.conf
270
271
	dodir /etc/sandbox.d
273
	dodir /etc/sandbox.d
272
	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
274
	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
273
# /dev/crypto is used mostly by OpenSSL on *BSD platforms
275
# /dev/crypto is used mostly by OpenSSL on *BSD platforms
Lines 276-278 Link Here
276
SANDBOX_PREDICT="/dev/crypto"
278
SANDBOX_PREDICT="/dev/crypto"
277
EOF
279
EOF
278
}
280
}
281
282
pkg_preinst() {
283
	# Keep old libs if we already have them
284
	preserve_old_lib "${ROOT}usr/$(get_libdir)/libc_r.so.6"
285
	preserve_old_lib "${ROOT}$(get_libdir)/libpthread.so.2"
286
}

Return to bug 192711