Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ TBD
* Prevent writing duplicate groups to metadata file
* Disable all filesystem access in flatpak-builder --run sandbox
* Add ability to set custom fusermount path
* Support setting CGO buildflags and RUSTFLAGS in builder environment

Changes in 1.4.6
================
Expand Down
32 changes: 32 additions & 0 deletions data/flatpak-manifest.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,18 @@
"description": "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.",
"type": "string"
},
"cgo-cflags": {
"description": "This is set in the environment variable CGO_CFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces. If unset, defaults to the value of cflags.",
"type": "string"
},
"cflags-override": {
"description": "If this is true, clear cflags from previous build options before adding it from these options.",
"type": "boolean"
},
"cgo-cflags-override": {
"description": "If this is true, clear cgo-cflags from previous build options before adding it from these options. If set without cgo-cflags, CGO_CFLAGS will not be set.",
"type": "boolean"
},
"cppflags": {
"description": "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.",
"type": "string"
Expand All @@ -38,18 +46,42 @@
"description": "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.",
"type": "string"
},
"cgo-cxxflags": {
"description": "This is set in the environment variable CGO_CXXFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces. If unset, defaults to the value of cxxflags.",
"type": "string"
},
"cxxflags-override": {
"description": "If this is true, clear cxxflags from previous build options before adding it from these options.",
"type": "boolean"
},
"cgo-cxxflags-override": {
"description": "If this is true, clear cgo-cxxflags from previous build options before adding it from these options. If set without cgo-cxxflags, CGO_CXXFLAGS will not be set.",
"type": "boolean"
},
"ldflags": {
"description": "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.",
"type": "string"
},
"cgo-ldflags": {
"description": "This is set in the environment variable CGO_LDFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces. If unset, defaults to the value of ldflags.",
"type": "string"
},
"ldflags-override": {
"description": "If this is true, clear ldflags from previous build options before adding it from these options.",
"type": "boolean"
},
"cgo-ldflags-override": {
"description": "If this is true, clear cgo-ldflags from previous build options before adding it from these options. If set without cgo-ldflags, CGO_LDFLAGS will not be set.",
"type": "boolean"
},
"rustflags": {
"description": "This is set in the environment variable RUSTFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces.",
"type": "string"
},
"rustflags-override": {
"description": "If this is true, clear rustflags from previous build options before adding it from these options.",
"type": "boolean"
},
"prefix": {
"description": "The build prefix for the modules (defaults to /app for applications and /usr for runtimes).",
"type": "string"
Expand Down
32 changes: 32 additions & 0 deletions doc/flatpak-manifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,18 @@
<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>cgo-cflags</option> (string)</term>
<listitem><para>This is set in the environment variable CGO_CFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces. If unset, defaults to the value of cflags.</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>cgo-cflags-override</option> (boolean)</term>
<listitem><para>If this is true, clear cgo-cflags from previous build options before adding it from these options. If set without cgo-cflags, CGO_CFLAGS will not be set.</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>
Expand All @@ -328,18 +336,42 @@
<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>cgo-cxxflags</option> (string)</term>
<listitem><para>This is set in the environment variable CGO_CXXFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces. If unset, defaults to the value of cxxflags.</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>cgo-cxxflags-override</option> (boolean)</term>
<listitem><para>If this is true, clear cgo-cxxflags from previous build options before adding it from these options. If set without cgo-cxxflags, CGO_CXXFLAGS will not be set.</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>cgo-ldflags</option> (string)</term>
<listitem><para>This is set in the environment variable CGO_LDFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces. If unset, defaults to the value of ldflags.</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>cgo-ldflags-override</option> (boolean)</term>
<listitem><para>If this is true, clear cgo-ldflags from previous build options before adding it from these options. If set without cgo-ldflags, CGO_LDFLAGS will not be set.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>rustflags</option> (string)</term>
<listitem><para>This is set in the environment variable RUSTFLAGS during the build. Multiple specifications of this (in e.g. per-arch area) are concatenated, separated by spaces.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>rustflags-override</option> (boolean)</term>
<listitem><para>If this is true, clear rustflags 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
Expand Down
Loading