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

Collapse All | Expand All

(-)a/jail-2.0.ebuild (-11 / +5 lines)
Lines 32-49 Link Here
32
	sed -i "s:\$4/etc:\${D}/etc:g" install.sh || die
32
	sed -i "s:\$4/etc:\${D}/etc:g" install.sh || die
33
33
34
	# the destination directory should be /usr not /usr/local
34
	# the destination directory should be /usr not /usr/local
35
	cd "${S}"/src
36
	sed -i -e "s:usr/local:${D}/usr:g" \
35
	sed -i -e "s:usr/local:${D}/usr:g" \
37
		-e "s:^COPT =.*:COPT = -Wl,-z,no:g" Makefile || die
36
		-e "s:^COPT =.*:COPT = -Wl,-z,no:g" src/Makefile || die
38
37
39
	# Below didn't work. Don't know why
38
	# Below didn't work. Don't know why
40
	#append-ldflags -Wl,-z,now
39
	#append-ldflags -Wl,-z,now
41
	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
40
	emake -C src CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
42
}
41
}
43
42
44
src_install() {
43
src_install() {
45
	cd "${S}"/src
44
	emake -C src install
46
	einstall
47
45
48
	# remove //var/tmp/portage/${P}/image//usr from files
46
	# remove //var/tmp/portage/${P}/image//usr from files
49
	FILES=( "${D}/usr/bin/mkjailenv"
47
	FILES=( "${D}/usr/bin/mkjailenv"
Lines 63-76 Link Here
63
		"${D}/usr/lib/arch/solaris/functions" )
61
		"${D}/usr/lib/arch/solaris/functions" )
64
62
65
	for f in "${FILES[@]}"; do
63
	for f in "${FILES[@]}"; do
66
		# documentation says funtion 'dosed' is supposed to do this, but didn't know how to make it work :'(
67
		# dosed ${file} || die "error in dosed"
68
		sed -i "s:/${D}/usr:/usr:g" ${f} || die
64
		sed -i "s:/${D}/usr:/usr:g" ${f} || die
69
	done
65
	done
70
66
71
	cd "${D}"/usr/lib
67
	sed -i "s:/usr/etc:/etc:" "${D}"/usr/lib/libjail.pm || die
72
	sed -i "s:/usr/etc:/etc:" libjail.pm || die
73
68
74
	cd "${S}"/doc
69
	dodoc doc/{CHANGELOG,INSTALL,README,SECURITY,VERSION}
75
	dodoc CHANGELOG INSTALL README SECURITY VERSION
76
}
70
}

Return to bug 514892