marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BuildOptions: Add *flags-override keys 

This is a more generic way than sdk-default-override to change how the various
flag fields are overridden. Now you can override both the sdk default as well as
in-file options.

Closes: #150
Approved by: alexlarsson
auto
Alexander Larsson 2018-05-14 09:52:51 +02:00 committed by Atomic Bot
parent 808ebb41f6
commit ae48dbc21e
2 changed files with 97 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/flatpak-manifest.xml
View File

@ -272,18 +272,34 @@
<term><option>cflags</option> (string)</term>
<listitem><para>This is set in the environment variable CFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>cflags-override</option> (boolean)</term>
<listitem><para>If this is true, clear cflags from previous build options before adding it from these options.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>cppflags</option> (string)</term>
<listitem><para>This is set in the environment variable CPPFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>cppflags-override</option> (boolean)</term>
<listitem><para>If this is true, clear cppflags from previous build options before adding it from these options.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>cxxflags</option> (string)</term>
<listitem><para>This is set in the environment variable CXXFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>cxxflags-override</option> (boolean)</term>
<listitem><para>If this is true, clear cxxflags from previous build options before adding it from these options.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>ldflags</option> (string)</term>
<listitem><para>This is set in the environment variable LDFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>ldflags-override</option> (boolean)</term>
<listitem><para>If this is true, clear ldflags from previous build options before adding it from these options.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>prefix</option> (string)</term>
<listitem><para>The build prefix for the modules (defaults to <filename>/app</filename> for

81
src/builder-options.c
View File

@ -40,9 +40,13 @@ struct BuilderOptions
gboolean no_debuginfo;
gboolean no_debuginfo_compression;
char *cflags;
gboolean cflags_override;
char *cppflags;
gboolean cppflags_override;
char *cxxflags;
gboolean cxxflags_override;
char *ldflags;
gboolean ldflags_override;
char *append_path;
char *prepend_path;
char *append_ld_library_path;
@ -74,9 +78,13 @@ G_DEFINE_TYPE_WITH_CODE (BuilderOptions, builder_options, G_TYPE_OBJECT,
enum {
PROP_0,
PROP_CFLAGS,
PROP_CFLAGS_OVERRIDE,
PROP_CPPFLAGS,
PROP_CPPFLAGS_OVERRIDE,
PROP_CXXFLAGS,
PROP_CXXFLAGS_OVERRIDE,
PROP_LDFLAGS,
PROP_LDFLAGS_OVERRIDE,
PROP_PREFIX,
PROP_LIBDIR,
PROP_ENV,
@ -143,18 +151,34 @@ builder_options_get_property (GObject *object,
g_value_set_string (value, self->cflags);
break;
case PROP_CFLAGS_OVERRIDE:
g_value_set_boolean (value, self->cflags_override);
break;
case PROP_CPPFLAGS:
g_value_set_string (value, self->cppflags);
break;
case PROP_CPPFLAGS_OVERRIDE:
g_value_set_boolean (value, self->cppflags_override);
break;
case PROP_CXXFLAGS:
g_value_set_string (value, self->cxxflags);
break;
case PROP_CXXFLAGS_OVERRIDE:
g_value_set_boolean (value, self->cxxflags_override);
break;
case PROP_LDFLAGS:
g_value_set_string (value, self->ldflags);
break;
case PROP_LDFLAGS_OVERRIDE:
g_value_set_boolean (value, self->ldflags_override);
break;
case PROP_APPEND_PATH:
g_value_set_string (value, self->append_path);
break;
@ -252,21 +276,37 @@ builder_options_set_property (GObject *object,
self->cflags = g_value_dup_string (value);
break;
case PROP_CFLAGS_OVERRIDE:
self->cflags_override = g_value_get_boolean (value);
break;
case PROP_CXXFLAGS:
g_clear_pointer (&self->cxxflags, g_free);
self->cxxflags = g_value_dup_string (value);
break;
case PROP_CXXFLAGS_OVERRIDE:
self->cxxflags_override = g_value_get_boolean (value);
break;
case PROP_CPPFLAGS:
g_clear_pointer (&self->cppflags, g_free);
self->cppflags = g_value_dup_string (value);
break;
case PROP_CPPFLAGS_OVERRIDE:
self->cppflags_override = g_value_get_boolean (value);
break;
case PROP_LDFLAGS:
g_clear_pointer (&self->ldflags, g_free);
self->ldflags = g_value_dup_string (value);
break;
case PROP_LDFLAGS_OVERRIDE:
self->ldflags_override = g_value_get_boolean (value);
break;
case PROP_APPEND_PATH:
g_clear_pointer (&self->append_path, g_free);
self->append_path = g_value_dup_string (value);
@ -386,6 +426,13 @@ builder_options_class_init (BuilderOptionsClass *klass)
"",
NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_CFLAGS_OVERRIDE,
g_param_spec_boolean ("cflags-override",
"",
"",
FALSE,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_CXXFLAGS,
g_param_spec_string ("cxxflags",
@ -393,6 +440,13 @@ builder_options_class_init (BuilderOptionsClass *klass)
"",
NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_CXXFLAGS_OVERRIDE,
g_param_spec_boolean ("cxxflags-override",
"",
"",
FALSE,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_CPPFLAGS,
g_param_spec_string ("cppflags",
@ -400,6 +454,13 @@ builder_options_class_init (BuilderOptionsClass *klass)
"",
NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_CPPFLAGS_OVERRIDE,
g_param_spec_boolean ("cppflags-override",
"",
"",
FALSE,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_LDFLAGS,
g_param_spec_string ("ldflags",
@ -407,6 +468,13 @@ builder_options_class_init (BuilderOptionsClass *klass)
"",
NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_LDFLAGS_OVERRIDE,
g_param_spec_boolean ("ldflags-override",
"",
"",
FALSE,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_APPEND_PATH,
g_param_spec_string ("append-path",
@ -759,6 +827,7 @@ static const char *
builder_options_get_flags (BuilderOptions *self,
BuilderContext *context,
size_t field_offset,
size_t override_field_offset,
const char *sdk_flags)
{
g_autoptr(GList) options = get_all_options (self, context);
@ -777,6 +846,10 @@ builder_options_get_flags (BuilderOptions *self,
{
BuilderOptions *o = l->data;
const char *flag = G_STRUCT_MEMBER (const char *, o, field_offset);
gboolean override = G_STRUCT_MEMBER (gboolean, o, override_field_offset);
if (override && flags)
g_string_truncate (flags, 0);
if (flag)
{
@ -826,6 +899,7 @@ const char *
builder_options_get_cflags (BuilderOptions *self, BuilderContext *context)
{
return builder_options_get_flags (self, context, G_STRUCT_OFFSET (BuilderOptions, cflags),
G_STRUCT_OFFSET (BuilderOptions, cflags_override),
get_sdk_flags (self, context, builder_sdk_config_get_cflags));
}
@ -833,6 +907,7 @@ const char *
builder_options_get_cxxflags (BuilderOptions *self, BuilderContext *context)
{
return builder_options_get_flags (self, context, G_STRUCT_OFFSET (BuilderOptions, cxxflags),
G_STRUCT_OFFSET (BuilderOptions, cxxflags_override),
get_sdk_flags (self, context, builder_sdk_config_get_cxxflags));
}
@ -840,6 +915,7 @@ const char *
builder_options_get_cppflags (BuilderOptions *self, BuilderContext *context)
{
return builder_options_get_flags (self, context, G_STRUCT_OFFSET (BuilderOptions, cppflags),
G_STRUCT_OFFSET (BuilderOptions, cppflags_override),
get_sdk_flags (self, context, builder_sdk_config_get_cppflags));
}
@ -847,6 +923,7 @@ const char *
builder_options_get_ldflags (BuilderOptions *self, BuilderContext *context)
{
return builder_options_get_flags (self, context, G_STRUCT_OFFSET (BuilderOptions, ldflags),
G_STRUCT_OFFSET (BuilderOptions, ldflags_override),
get_sdk_flags (self, context, builder_sdk_config_get_ldflags));
}
@ -1245,9 +1322,13 @@ builder_options_checksum (BuilderOptions *self,
builder_cache_checksum_str (cache, BUILDER_OPTION_CHECKSUM_VERSION);
builder_cache_checksum_str (cache, self->cflags);
builder_cache_checksum_compat_boolean (cache, self->cflags_override);
builder_cache_checksum_str (cache, self->cxxflags);
builder_cache_checksum_compat_boolean (cache, self->cxxflags_override);
builder_cache_checksum_str (cache, self->cppflags);
builder_cache_checksum_compat_boolean (cache, self->cppflags_override);
builder_cache_checksum_str (cache, self->ldflags);
builder_cache_checksum_compat_boolean (cache, self->ldflags_override);
builder_cache_checksum_str (cache, self->prefix);
builder_cache_checksum_compat_str (cache, self->libdir);
builder_cache_checksum_strv (cache, self->env);