Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
Date: Sat, 25 Jun 2016 03:09:38
Message-Id: 1466824152.b60e6814ea6c95cedac4e03c2a1ce574207dea30.vapier@gentoo
1 commit: b60e6814ea6c95cedac4e03c2a1ce574207dea30
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 25 03:07:30 2016 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 25 03:09:12 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60e6814
7
8 sys-apps/file: build magic.h before libmagic.la #586444
9
10 Since the header is a BUILT_SOURCES which is normally created only when
11 you run `make all`, make sure we generate it by hand before building the
12 library in the multilib case.
13
14 sys-apps/file/file-5.28.ebuild | 4 +++-
15 sys-apps/file/file-9999.ebuild | 4 +++-
16 2 files changed, 6 insertions(+), 2 deletions(-)
17
18 diff --git a/sys-apps/file/file-5.28.ebuild b/sys-apps/file/file-5.28.ebuild
19 index 6ebccd6..ee20eaa 100644
20 --- a/sys-apps/file/file-5.28.ebuild
21 +++ b/sys-apps/file/file-5.28.ebuild
22 @@ -78,7 +78,9 @@ multilib_src_compile() {
23 if multilib_is_native_abi ; then
24 emake
25 else
26 - emake -C src libmagic.la
27 + cd src
28 + emake magic.h #586444
29 + emake libmagic.la
30 fi
31 }
32
33
34 diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
35 index 658a92f..1bdaecc 100644
36 --- a/sys-apps/file/file-9999.ebuild
37 +++ b/sys-apps/file/file-9999.ebuild
38 @@ -78,7 +78,9 @@ multilib_src_compile() {
39 if multilib_is_native_abi ; then
40 emake
41 else
42 - emake -C src libmagic.la
43 + cd src
44 + emake magic.h #586444
45 + emake libmagic.la
46 fi
47 }