0 | |
From d844bfeac7d885c45754649a8108adf58f8d0e4b Mon Sep 17 00:00:00 2001
|
1 | |
From: Adrian Cornish <acornish@spotxchange.com>
|
2 | |
Date: Tue, 5 Sep 2017 15:04:53 -0600
|
3 | |
Subject: [PATCH] Some fixes for building on Fedora
|
4 | |
|
5 | |
---
|
6 | |
ruby/print_arch | 6 +++---
|
7 | |
src/languages.h | 2 +-
|
8 | |
src/parser.c | 2 +-
|
9 | |
3 files changed, 5 insertions(+), 5 deletions(-)
|
10 | |
|
11 | |
Index: ohcount/ruby/print_arch
|
12 | |
===================================================================
|
13 | |
--- ohcount.orig/ruby/print_arch
|
14 | |
+++ ohcount/ruby/print_arch
|
15 | |
@@ -3,13 +3,13 @@ require 'mkmf'
|
16 | |
|
17 | |
arch = RbConfig::expand(CONFIG["arch"])
|
18 | |
|
19 | |
-distro = if File.exist?("/etc/issue")
|
20 | |
+distro = if File.exist?("/etc/os-release")
|
21 | |
# this is "", "CentOS" or "Ubuntu"
|
22 | |
- `cat /etc/issue`.split.first.downcase
|
23 | |
+ `egrep "^ID=.*" /etc/os-release`.split("=")[1].downcase
|
24 | |
end
|
25 | |
|
26 | |
unless ["centos", nil, "ubuntu"].include? distro
|
27 | |
- STDERR.puts "unhandled /etc/issue result: #{distro}"
|
28 | |
+ STDERR.puts "unhandled /etc/os-release result: #{distro}"
|
29 | |
end
|
30 | |
|
31 | |
# either <arch> or <arch>_<distro> if distro is non-null
|
32 | |
Index: ohcount/src/languages.h
|
33 | |
===================================================================
|
34 | |
--- ohcount.orig/src/languages.h
|
35 | |
+++ ohcount/src/languages.h
|
36 | |
@@ -120,6 +120,6 @@
|
37 | |
|
38 | |
// For gperf.
|
39 | |
struct LanguageMap { const char *key; const char *name; const char *nice_name; int category; };
|
40 | |
-struct LanguageMap *ohcount_hash_language_from_name(register const char *str, register unsigned int len);
|
41 | |
+struct LanguageMap *ohcount_hash_language_from_name(register const char *str, register size_t len);
|
42 | |
|
43 | |
#endif
|
44 | |
Index: ohcount/src/parser.c
|
45 | |
===================================================================
|
46 | |
--- ohcount.orig/src/parser.c
|
47 | |
+++ ohcount/src/parser.c
|
48 | |
@@ -7,7 +7,7 @@
|
49 | |
#include "log.h"
|
50 | |
#include "hash/parser_hash.h"
|
51 | |
|
52 | |
-struct ParserMap * ohcount_hash_parser_from_language (register const char *str, register unsigned int len);
|
53 | |
+struct ParserMap * ohcount_hash_parser_from_language (register const char *str, register size_t len);
|
54 | |
|
55 | |
int ohcount_parse(SourceFile *sourcefile, int count,
|
56 | |
void (*callback) (const char *, const char *, int, int,
|