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

BuildOptions: Drop sdk-default-override 

We now have the xxxflags-override keys to do this in a more generic way.

Closes: #150
Approved by: alexlarsson
auto
Alexander Larsson 2018-05-14 09:59:15 +02:00 committed by Atomic Bot
parent ae48dbc21e
commit 36f620240e
1 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/builder-options.c
View File

@ -62,7 +62,6 @@ struct BuilderOptions
char **make_args;
char **make_install_args;
GHashTable *arch;
BuilderSdkConfig *sdk_default_override;
};
typedef struct
@ -103,7 +102,6 @@ enum {
PROP_PREPEND_LD_LIBRARY_PATH,
PROP_APPEND_PKG_CONFIG_PATH,
PROP_PREPEND_PKG_CONFIG_PATH,
PROP_SDK_DEFAULT_OVERRIDE,
LAST_PROP
};
@ -132,7 +130,6 @@ builder_options_finalize (GObject *object)
g_strfreev (self->make_args);
g_strfreev (self->make_install_args);
g_hash_table_destroy (self->arch);
g_clear_object (&self->sdk_default_override);
G_OBJECT_CLASS (builder_options_parent_class)->finalize (object);
}
@ -251,10 +248,6 @@ builder_options_get_property (GObject *object,
g_value_set_boolean (value, self->no_debuginfo_compression);
break;
case PROP_SDK_DEFAULT_OVERRIDE:
g_value_set_object (value, self->sdk_default_override);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@ -401,10 +394,6 @@ builder_options_set_property (GObject *object,
self->no_debuginfo_compression = g_value_get_boolean (value);
break;
case PROP_SDK_DEFAULT_OVERRIDE:
g_set_object(&self->sdk_default_override, g_value_dup_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@ -602,13 +591,6 @@ builder_options_class_init (BuilderOptionsClass *klass)
FALSE,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_SDK_DEFAULT_OVERRIDE,
g_param_spec_object ("sdk-default-override",
"",
"",
BUILDER_TYPE_SDK_CONFIG,
G_PARAM_READWRITE));
}
static void
@ -872,29 +854,12 @@ builder_options_get_flags (BuilderOptions *self,
static const char *
get_sdk_flags (BuilderOptions *self, BuilderContext *context, const char *(*method)(BuilderSdkConfig *self))
{
g_autoptr(GList) options = get_all_options (self, context);
GList *l;
for (l = options; l != NULL; l = l->next)
{
BuilderOptions *o = l->data;
if (o->sdk_default_override)
{
const char * sdk_flags = (*method) (o->sdk_default_override);
if (sdk_flags)
return sdk_flags;
}
}
{
BuilderSdkConfig *sdk_config = builder_context_get_sdk_config (context);
if (sdk_config)
{
const char *sdk_flags = (*method) (sdk_config);
return sdk_flags;
}
}
BuilderSdkConfig *sdk_config = builder_context_get_sdk_config (context);
if (sdk_config)
return (*method) (sdk_config);
return NULL;
}
const char *
builder_options_get_cflags (BuilderOptions *self, BuilderContext *context)
{