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

Collapse All | Expand All

(-)sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild (-6 / +11 lines)
Lines 2-8 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild,v 1.11 2005/02/07 08:25:28 corsair Exp $
3
# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild,v 1.11 2005/02/07 08:25:28 corsair Exp $
4
4
5
inherit eutils flag-o-matic libtool gnuconfig versionator
5
inherit eutils flag-o-matic libtool gnuconfig versionator multilib
6
6
7
transform_known_flags() {
7
transform_known_flags() {
8
	declare setting
8
	declare setting
Lines 147-153 Link Here
147
	>=sys-devel/gcc-config-1.3.1
147
	>=sys-devel/gcc-config-1.3.1
148
	>=sys-devel/gcc-3.3.3_pre20040130
148
	>=sys-devel/gcc-3.3.3_pre20040130
149
	!build? ( >=sys-libs/ncurses-5.2-r2
149
	!build? ( >=sys-libs/ncurses-5.2-r2
150
	          nls? ( sys-devel/gettext ) )"
150
	          nls? ( sys-devel/gettext ) )
151
	!<app-emulation/emul-linux-x86-compat-1000"
151
152
152
RDEPEND="virtual/libc
153
RDEPEND="virtual/libc
153
	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
154
	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
Lines 185-191 Link Here
185
		myconf="${myconf} --enable-nls --without-included-gettext"
186
		myconf="${myconf} --enable-nls --without-included-gettext"
186
	fi
187
	fi
187
188
188
	use amd64 && myconf="${myconf} --disable-multilib"
189
	use amd64 && ! has_multilib_profile && myconf="${myconf} --disable-multilib"
189
190
190
	do_filter_flags
191
	do_filter_flags
191
	einfo "CFLAGS=\"${CFLAGS}\""
192
	einfo "CFLAGS=\"${CFLAGS}\""
Lines 271-286 Link Here
271
	# other than the normal versioned directory, so that it doesnt conflict
272
	# other than the normal versioned directory, so that it doesnt conflict
272
	# with gcc 3.3.3
273
	# with gcc 3.3.3
273
	mkdir -p ${D}/${LOC}/lib/libstdc++-v3/
274
	mkdir -p ${D}/${LOC}/lib/libstdc++-v3/
275
	use amd64 && has_multilib_profile && mkdir -p ${D}/${LOC}/lib32/libstdc++-v3/
274
	mv ${D}/${LIBPATH}/lib* ${D}/${LOC}/lib/libstdc++-v3/
276
	mv ${D}/${LIBPATH}/lib* ${D}/${LOC}/lib/libstdc++-v3/
277
	use amd64 && has_multilib_profile && mv ${D}/${LIBPATH}/32/lib* ${D}/${LOC}/lib32/libstdc++-v3/
275
	# we dont want the headers...
278
	# we dont want the headers...
276
	rm -rf ${D}/${LOC}/lib/gcc*
279
	rm -rf ${D}/${LOC}/lib{,32}/gcc*
277
	# or locales...
280
	# or locales...
278
	rm -rf ${D}/${LOC}/share
281
	rm -rf ${D}/${LOC}/share
279
	# or anything other than the .so files, really.
282
	# or anything other than the .so files, really.
280
	find ${D} | grep -e c++.la$ -e c++.a$ | xargs rm -f
283
	find ${D} | grep -e c++.la$ -e c++.a$ | xargs rm -f
281
	# we dont even want the un-versioned .so symlink, as it confuses some
284
	# we dont even want the un-versioned .so symlink, as it confuses some
282
	# apps and also causes others to link against the old libstdc++...
285
	# apps and also causes others to link against the old libstdc++...
283
	rm ${D}/${LOC}/lib/libstdc++-v3/libstdc++.so
286
	rm -f ${D}/${LOC}/lib{,32}/libstdc++-v3/libstdc++.so
284
287
285
	# and it's much easier to just move around the result than it is to
288
	# and it's much easier to just move around the result than it is to
286
	# configure libstdc++-v3 to use CONF_LIDIR
289
	# configure libstdc++-v3 to use CONF_LIDIR
Lines 289-293 Link Here
289
	fi
292
	fi
290
293
291
	mkdir -p ${D}/etc/env.d/
294
	mkdir -p ${D}/etc/env.d/
292
	echo "LDPATH=\"${LOC}/lib/libstdc++-v3/\"" >> ${D}/etc/env.d/99libstdc++
295
	local l32
296
	use amd64 && has_multilib_profile && l32="${LOC}/lib32/libstdc++-v3/:"
297
	echo "LDPATH=\"${l32}${LOC}/lib/libstdc++-v3/\"" >> ${D}/etc/env.d/99libstdc++
293
}
298
}

Return to bug 83904