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

Collapse All | Expand All

(-)pcmcia.eclass.bak (-2 / +12 lines)
Lines 39-44 Link Here
39
SRC_URI="pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_BASE_VERSION}.tar.gz \
39
SRC_URI="pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_BASE_VERSION}.tar.gz \
40
			http://dev.gentoo.org/~latexer/files/patches/${PCMCIA_BASE_VERSION}-module-init-tools.diff.gz
40
			http://dev.gentoo.org/~latexer/files/patches/${PCMCIA_BASE_VERSION}-module-init-tools.diff.gz
41
			http://dev.gentoo.org/~latexer/files/patches/${PCMCIA_BASE_VERSION}-SMP-fix.diff.gz
41
			http://dev.gentoo.org/~latexer/files/patches/${PCMCIA_BASE_VERSION}-SMP-fix.diff.gz
42
			http://dev.gentoo.org/~latexer/files/patches/${PCMCIA_BASE_VERSION}-koutput.diff.gz
42
			http://dev.gentoo.org/~latexer/files/patches/${PATCH_TO_3_2_6} \
43
			http://dev.gentoo.org/~latexer/files/patches/${PATCH_TO_3_2_6} \
43
			http://dev.gentoo.org/~latexer/files/patches/${PATCH_TO_3_2_7} )"
44
			http://dev.gentoo.org/~latexer/files/patches/${PATCH_TO_3_2_7} )"
44
45
Lines 52-61 Link Here
52
53
53
pcmcia_src_unpack()
54
pcmcia_src_unpack()
54
{
55
{
56
	if [ -z "${KV_OUTPUT}" ]
57
	then
58
		eerror "pcmcia_src_unpack() must be called after kernel-mod_src_unpack()"
59
		error "so the build environment is sane."
60
		die "pcmcia_src_unpack() called in invalid context"
61
	fi
62
55
	cd ${WORKDIR}
63
	cd ${WORKDIR}
56
64
57
	if [ -n "`use pcmcia`" ]; then
65
	if [ -n "`use pcmcia`" ]; then
58
		if egrep '^CONFIG_PCMCIA=[ym]' /usr/src/linux/.config >&/dev/null
66
		if egrep '^CONFIG_PCMCIA=[ym]' ${KV_OUTPUT}/.config >&/dev/null
59
		then
67
		then
60
			# Sadly, we still need to download these sources in SRC_URI
68
			# Sadly, we still need to download these sources in SRC_URI
61
			# til portage can handle more dynamic SRC_URIs
69
			# til portage can handle more dynamic SRC_URIs
Lines 68-73 Link Here
68
			unpack ${PCMCIA_BASE_VERSION}.tar.gz
76
			unpack ${PCMCIA_BASE_VERSION}.tar.gz
69
			cd ${PCMCIA_SOURCE_DIR}
77
			cd ${PCMCIA_SOURCE_DIR}
70
			epatch ${DISTDIR}/${PCMCIA_BASE_VERSION}-module-init-tools.diff.gz
78
			epatch ${DISTDIR}/${PCMCIA_BASE_VERSION}-module-init-tools.diff.gz
79
			epatch ${DISTDIR}/${PCMCIA_BASE_VERSION}-koutput.diff.gz
71
			epatch ${DISTDIR}/${PCMCIA_BASE_VERSION}-SMP-fix.diff.gz
80
			epatch ${DISTDIR}/${PCMCIA_BASE_VERSION}-SMP-fix.diff.gz
72
			PCMCIA_CS_EBUILD=(/var/db/pkg/sys-apps/pcmcia-cs-*/pcmcia-cs-*.ebuild) ## use bash globbing
81
			PCMCIA_CS_EBUILD=(/var/db/pkg/sys-apps/pcmcia-cs-*/pcmcia-cs-*.ebuild) ## use bash globbing
73
			if [ ! -f "${PCMCIA_CS_EBUILD}" ]; then
82
			if [ ! -f "${PCMCIA_CS_EBUILD}" ]; then
Lines 97-103 Link Here
97
pcmcia_configure()
106
pcmcia_configure()
98
{
107
{
99
	if [ -n "`use pcmcia`" ]; then
108
	if [ -n "`use pcmcia`" ]; then
100
		if ! egrep '^CONFIG_PCMCIA=[ym]' /usr/src/linux/.config >&/dev/null
109
		if ! egrep '^CONFIG_PCMCIA=[ym]' ${KV_OUTPUT}/.config >&/dev/null
101
		then
110
		then
102
			cd ${PCMCIA_SOURCE_DIR}
111
			cd ${PCMCIA_SOURCE_DIR}
103
			local myarch
112
			local myarch
Lines 114-119 Link Here
114
				--target=${D} \
123
				--target=${D} \
115
				--srctree \
124
				--srctree \
116
				--kernel=/usr/src/linux \
125
				--kernel=/usr/src/linux \
126
				--koutput=${KV_OUTPUT} \
117
				--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
127
				--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
118
				--arch="${myarch}" \
128
				--arch="${myarch}" \
119
				--uflags="${CFLAGS}" || die "failed configuring pcmcia-cs"
129
				--uflags="${CFLAGS}" || die "failed configuring pcmcia-cs"

Return to bug 32737