1 |
commit: f4096f6f03fe297fe028e77cd8792d6d40a8f9be |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 29 23:47:58 2011 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 29 23:47:58 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=f4096f6f |
7 |
|
8 |
dev-vcs/git: ask for no ICONV, unmask coreutils-8.5-r1 |
9 |
|
10 |
(Portage version: 2.1.10.41/git/Linux x86_64, signed Manifest commit with key 0xD0455535) |
11 |
|
12 |
--- |
13 |
dev-vcs/git/git-1.7.0.4.ebuild | 11 +---------- |
14 |
profiles/hardened/linux/uclibc/package.mask | 2 +- |
15 |
2 files changed, 2 insertions(+), 11 deletions(-) |
16 |
|
17 |
diff --git a/dev-vcs/git/git-1.7.0.4.ebuild b/dev-vcs/git/git-1.7.0.4.ebuild |
18 |
index bb1658f..9ab3105 100644 |
19 |
--- a/dev-vcs/git/git-1.7.0.4.ebuild |
20 |
+++ b/dev-vcs/git/git-1.7.0.4.ebuild |
21 |
@@ -37,7 +37,7 @@ src_prepare() { |
22 |
} |
23 |
|
24 |
git_emake() { |
25 |
- emake ${MY_MAKEOPTS} \ |
26 |
+ emake "NO_NSEC=YesPlease NO_ICONV=YesPlease" \ |
27 |
DESTDIR="${D}" \ |
28 |
OPTCFLAGS="${CFLAGS}" \ |
29 |
OPTLDFLAGS="${LDFLAGS}" \ |
30 |
@@ -47,15 +47,6 @@ git_emake() { |
31 |
"$@" |
32 |
} |
33 |
|
34 |
-src_configure() { |
35 |
- local myopts |
36 |
- |
37 |
- [[ "${CHOST}" == *-uclibc* ]] && \ |
38 |
- myopts="${myopts} NO_NSEC=YesPlease" |
39 |
- |
40 |
- export MY_MAKEOPTS="${myopts}" |
41 |
-} |
42 |
- |
43 |
src_compile() { |
44 |
git_emake |
45 |
} |
46 |
|
47 |
diff --git a/profiles/hardened/linux/uclibc/package.mask b/profiles/hardened/linux/uclibc/package.mask |
48 |
index 5e524c7..df94406 100644 |
49 |
--- a/profiles/hardened/linux/uclibc/package.mask |
50 |
+++ b/profiles/hardened/linux/uclibc/package.mask |
51 |
@@ -9,6 +9,6 @@ dev-libs/glib |
52 |
>dev-util/pkgconfig-0.25-r2 |
53 |
>dev-vcs/git-1.7.0.4 |
54 |
>net-misc/dhcp-3.1.2_p1 |
55 |
->sys-apps/coreutils-8.4 |
56 |
+>sys-apps/coreutils-8.5-r1 |
57 |
>sys-apps/util-linux-2.18-r1 |
58 |
>sys-fs/udev-141 |