1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
From: Luotao Fu <l.fu@pengutronix.de>
Date: Sun, 30 Oct 2011 22:29:02 +0100
Subject: [PATCH] make pkg-config binary configurable
glademm calls directly pkg-config in $PATH. We however need that customizable
pkg-config to be called, i.E. our host built pkg-config in BSP. Hence we make
the path to the pkg-config we want to call configurable via parameter.
not determined for upstream
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
---
src/Configuration.hh | 1 +
src/glade--.cc | 21 ++++++++++++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/Configuration.hh b/src/Configuration.hh
index e6c3698..bd4d5dc 100644
--- a/src/Configuration.hh
+++ b/src/Configuration.hh
@@ -83,6 +83,7 @@ struct Configuration : public Naming
std::string pixmap_dir_relative_to_src;
std::string author_name;
std::string author_email;
+ std::string pkgconfig_bin;
bool debug:1;
bool sample_code:1;
bool bare_bones:1;
diff --git a/src/glade--.cc b/src/glade--.cc
index 0347d97..662df30 100644
--- a/src/glade--.cc
+++ b/src/glade--.cc
@@ -93,7 +93,7 @@ const static struct option options[]=
{ "verbose", no_argument, NULL, 'v' },
{ "show-options", no_argument, NULL, SHOW_OPTIONS },
{ "image-provider", required_argument, NULL, IMAGE_PROVIDER },
-
+ { "pkgconfig", required_argument, NULL, 'p' },
{ NULL, 0, NULL, 0 }
};
@@ -134,7 +134,15 @@ static bool CheckVersion(const std::string &cmd, Pkg_Version &v, Pkg_Version::So
{ if (v.source==Pkg_Version::Command_Line) return true;
char buf[80];
bool result=false;
- FILE *f=popen(cmd.c_str(),"r");
+ FILE *f;
+ int i;
+ std::string n_cmd = cmd.c_str();
+ std::string::size_type loc = n_cmd.find("pkg-config", 0);
+ if (Configuration.pkgconfig_bin != "" && loc != std::string::npos) {
+ n_cmd.replace(loc, Configuration.pkgconfig_bin.length(),
+ Configuration.pkgconfig_bin);
+ }
+ f=popen(n_cmd.c_str(),"r");
if (f)
{ if (fgets(buf,sizeof(buf),f))
{ if (!ignore_letters)
@@ -144,11 +152,11 @@ static bool CheckVersion(const std::string &cmd, Pkg_Version &v, Pkg_Version::So
// not installed/found
if (!strncmp(buf,"Package ",8) && strstr(buf," not ")) result=false;
else if (parse_version(buf,v,src,ignore_letters)) result=true;
- else std::cerr << cmd << ": strange result '" << buf << "'\n";
+ else std::cerr << n_cmd << ": strange result '" << buf << "'\n";
}
pclose(f);
}
- else perror(cmd.c_str());
+ else perror(n_cmd.c_str());
return result;
}
@@ -383,7 +391,7 @@ int main(int argc,char **argv)
{ if (i) Configuration.commandline+=' ';
Configuration.commandline+=argv[i];
}
- while ((opt=getopt_long(argc,argv,"d:m:h:c:Vgrs1AwlN",options,NULL))!=EOF)
+ while ((opt=getopt_long(argc,argv,"d:m:h:c:p:Vgrs1AwlN",options,NULL))!=EOF)
switch(opt)
{ case 'd': Configuration.destination_directory=optarg;
break;
@@ -393,6 +401,8 @@ int main(int argc,char **argv)
break;
case 'h': Configuration.header_suffix=optarg;
break;
+ case 'p': Configuration.pkgconfig_bin=optarg;
+ break;
case 'V': std::cout<< "glademm V"VERSION" (glade to Gtk-- converter)\n";
return 0;
break;
@@ -487,6 +497,7 @@ int main(int argc,char **argv)
"\t--baseclass\tderive from base class (for class parameters)\n"
"\t--libglade\tgenerate code skeleton for a libglade-- application.\n"
"\t--libglade-option\tgenerate infrastructure for libglade without using it.\n"
+ "\t--pkgconfig\tpath to the pkg-config binary to be used\n"
"\t--version\tprints 'glademm V"VERSION"'\n";
return 1;
}
|
