Commit 4e232b8
committed
libmagic-sys-provided: let user override paths
let the user override assumed paths via environment.
TYPECODE_LIBMAGIC_PATH environment variable can be used to explicitly
set the path to libmagic.so. If not specified it falls back to
previously used calculation from distro data.
Location of the magic database can be specified via
TYPECODE_LIBMAGIC_DB_PATH environment variable.
If not found it falls back to the previous bevahior.
With this patch it possible to run scancode is buildsystems like YOCTO,
which heaviily rely on overriding paths via environment to pick the
correct implementation from the build workspace
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>1 parent 2ef0fb8 commit 4e232b8
2 files changed
Lines changed: 41 additions & 25 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
Lines changed: 33 additions & 24 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | 25 | | |
| 26 | + | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
35 | 36 | | |
36 | 37 | | |
37 | 38 | | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
44 | 51 | | |
45 | | - | |
46 | | - | |
47 | | - | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
48 | 55 | | |
49 | | - | |
50 | | - | |
51 | | - | |
| 56 | + | |
| 57 | + | |
52 | 58 | | |
53 | | - | |
54 | | - | |
| 59 | + | |
55 | 60 | | |
56 | | - | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
57 | 66 | | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
63 | 71 | | |
64 | | - | |
65 | | - | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
66 | 75 | | |
67 | 76 | | |
68 | 77 | | |
69 | 78 | | |
70 | | - | |
| 79 | + | |
71 | 80 | | |
72 | 81 | | |
0 commit comments