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

Collapse All | Expand All

(-)/usr/portage/sys-libs/pwdb/pwdb-0.62.ebuild.orig (-6 / +62 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/pwdb/pwdb-0.62.ebuild,v 1.19 2005/01/04 04:18:05 vapier Exp $
3
# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.19 2005/01/04 04:18:05 vapier Exp $
4
4
5
inherit eutils flag-o-matic
5
inherit eutils flag-o-matic multilib
6
6
7
DESCRIPTION="Password database"
7
DESCRIPTION="Password database"
8
HOMEPAGE="http://packages.gentoo.org/ebuilds/?pwdb-${PVR}"
8
HOMEPAGE="http://packages.gentoo.org/ebuilds/?pwdb-${PVR}"
Lines 14-20 Link Here
14
IUSE="selinux"
14
IUSE="selinux"
15
15
16
DEPEND="virtual/libc
16
DEPEND="virtual/libc
17
	selinux? ( sys-libs/libselinux )"
17
	selinux? ( sys-libs/libselinux )
18
	!app-emulation/emul-linux-x86-baselibs"
18
19
19
src_unpack () {
20
src_unpack () {
20
	unpack ${A}
21
	unpack ${A}
Lines 30-38 Link Here
30
		-e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \
31
		-e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \
31
		Makefile
32
		Makefile
32
	sed -i -e "s/=gcc/=$(tc-getCC)/g" default.defs
33
	sed -i -e "s/=gcc/=$(tc-getCC)/g" default.defs
34
	if use amd64 && has_multilib_profile; then
35
		cp -ar ${S} ${S}-x86
36
		mv ${S} ${S}-amd64
37
	fi
33
}
38
}
34
39
35
src_compile() {
40
src_compile() {
41
	if use amd64 && has_multilib_profile; then
42
		local OABI=${ABI}
43
		local OS=${S}
44
		local OPWD=$PWD
45
		ABI="x86"
46
		S=${OS}-x86
47
		cd ${S}
48
		src_compile-multilib
49
		ABI="amd64"
50
		S=${OS}-amd64
51
		cd ${S}
52
		src_compile-multilib
53
		S=${OS}
54
		ABI=${OABI}
55
		cd ${OPWD}
56
		unset OPWD
57
		unset OS
58
		unset OABI
59
	else
60
		src_compile-multilib
61
	fi
62
}
63
64
src_compile-multilib() {
36
	filter-flags -fstack-protector
65
	filter-flags -fstack-protector
37
66
38
	# author has specified application to be compiled with `-g` 
67
	# author has specified application to be compiled with `-g` 
Lines 44-59 Link Here
44
}
73
}
45
74
46
src_install() {
75
src_install() {
47
	dodir /lib /usr/include/pwdb
76
	if use amd64 && has_multilib_profile; then
77
		local OPWD=$PWD
78
		cd ${S}-x86
79
		dodir /lib32 /usr/include/pwdb
80
		make \
81
			INCLUDED=${D}/usr/include/pwdb \
82
			LIBDIR=${D}/lib32 \
83
			LDCONFIG="echo" \
84
			install || die
85
		preplib /
86
		dodir /usr/lib32
87
		mv ${D}/lib32/*.a ${D}/usr/lib32
88
		local OABI=${ABI}
89
		ABI="x86"
90
		gen_usr_ldscript libpwdb.so
91
		ABI=${OABI}
92
		unset OABI
93
		cd ${S}-amd64
94
		src_install-multilib 64
95
		cd ${OPWD}
96
		unset OPWD
97
	else
98
		src_install-multilib
99
	fi
100
}
101
102
src_install-multilib() {
103
	dodir /lib${1} /usr/include/pwdb
48
	make \
104
	make \
49
		INCLUDED=${D}/usr/include/pwdb \
105
		INCLUDED=${D}/usr/include/pwdb \
50
		LIBDIR=${D}/lib \
106
		LIBDIR=${D}/lib${1} \
51
		LDCONFIG="echo" \
107
		LDCONFIG="echo" \
52
		install || die
108
		install || die
53
109
54
	preplib /
110
	preplib /
55
	dodir /usr/lib
111
	dodir /usr/lib${1}
56
	mv ${D}/lib/*.a ${D}/usr/lib
112
	mv ${D}/lib${1}/*.a ${D}/usr/lib${1}
57
113
58
	# See bug $4411 for more info
114
	# See bug $4411 for more info
59
	gen_usr_ldscript libpwdb.so
115
	gen_usr_ldscript libpwdb.so

Return to bug 83811