1 |
commit: 43c7f8b2781e4b51706915a8dd5e55ff24b18cdc |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 17 23:34:52 2017 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 18 16:09:48 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c7f8b2 |
7 |
|
8 |
net-fs/cvmfs: fix to respect toolchain / cross-compiling |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
net-fs/cvmfs/cvmfs-2.3.5.ebuild | 31 ++++++++++++++++--------------- |
13 |
1 file changed, 16 insertions(+), 15 deletions(-) |
14 |
|
15 |
diff --git a/net-fs/cvmfs/cvmfs-2.3.5.ebuild b/net-fs/cvmfs/cvmfs-2.3.5.ebuild |
16 |
index ae16006ece1..8913abdb7b1 100644 |
17 |
--- a/net-fs/cvmfs/cvmfs-2.3.5.ebuild |
18 |
+++ b/net-fs/cvmfs/cvmfs-2.3.5.ebuild |
19 |
@@ -82,21 +82,22 @@ src_prepare() { |
20 |
sed -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \ |
21 |
-i CMakeLists.txt || die |
22 |
|
23 |
- sed -e 's|${res_path}/conf.d|${res_path/modules.d|' \ |
24 |
- -i cvmfs/cvmfs_server || die |
25 |
- |
26 |
- # hack for bundled vjson sha2 and sha3 |
27 |
- # vjson not worth unbundling, already upstream obsolete |
28 |
- # upstream replaced by gason with a new api |
29 |
- sed -e 's/g++/$(CXX)/g' \ |
30 |
- -e 's/ar/$(AR)/' \ |
31 |
- -e 's/ranlib/$(RANLIB)/' \ |
32 |
- -i externals/vjson/src/Makefile || die |
33 |
- local d |
34 |
- for d in vjson sha2 sha3; do |
35 |
- mkdir -p "${WORKDIR}/${P}_build"/externals/build_${d} |
36 |
- cp -r externals/${d}/src/* \ |
37 |
- "${WORKDIR}/${P}_build"/externals/build_${d}/ || die |
38 |
+ # hack for bundled packages |
39 |
+ # not worth unbundling upstreams are flaky/dead |
40 |
+ local pkg |
41 |
+ for pkg in vjson sha2 sha3; do |
42 |
+ # respect toolchain variables |
43 |
+ sed -e 's/g++/$(CXX)/g' \ |
44 |
+ -e 's/gcc/$(CC)/g' \ |
45 |
+ -e 's/CFLAGS/MYCFLAGS/g' \ |
46 |
+ -e 's/-O2/$(CFLAGS)/g' \ |
47 |
+ -e 's/-O2/$(CXXFLAGS)/g' \ |
48 |
+ -e 's/ar/$(AR)/' \ |
49 |
+ -e 's/ranlib/$(RANLIB)/' \ |
50 |
+ -i externals/${pkg}/src/Makefile || die |
51 |
+ mkdir -p "${WORKDIR}/${P}_build"/externals/build_${pkg} |
52 |
+ cp -r externals/${pkg}/src/* \ |
53 |
+ "${WORKDIR}/${P}_build"/externals/build_${pkg}/ || die |
54 |
done |
55 |
} |