Skip to content

Commit d65d18d

Browse files
committed
Update qbittorrent-nox-static.sh
Update changelog.md Update deploy.yml
1 parent 0e52609 commit d65d18d

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.github/workflows/deploy.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313
jobs:
1414
build:
1515
runs-on: ubuntu-latest
16+
permissions:
17+
contents: read
1618
steps:
1719
- name: Checkout your repository using git
1820
uses: actions/checkout@v4

changelog.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
`qbt-nox-static.bash``v2.1.0`
66

7-
`qbt-nox-static.bash` will start with `v2.1.0` and `qbittorrent-nox-static.sh` will be frozen at `v2.0.15`going forward. This is to avoid breaking anything by replacing `qbittorrent-nox-static.sh` with`qbt-nox-static.bash` and removing access to the old file. `v2.1.0` is not really changing the outcome but the behaviour of the script towards that outcome. So the least disruptive way is the opt in route. I also wanted to changed the extension from `sh` to `bash` as it is a bash script and this will be the least disruptive way to do it.
7+
`qbt-nox-static.bash` will start with `v2.1.0` and `qbittorrent-nox-static.sh` will be frozen at `v2.0.15`going forward. This is to avoid breaking anything by replacing `qbittorrent-nox-static.sh` with`qbt-nox-static.bash` and removing access to the old file. `v2.1.0` is not really changing the outcome but the behaviour of the script towards that outcome. So the least disruptive way is the opt in route. I also wanted to changed the extension from `sh` to `bash` as it is a bash script.
88

9-
There is feature parity between the two scripts as of this change. All major changes, fixes and tweaks are applied to both scripts with the exception of the reworked dependency and module installation logic as that shift data management of these functions into associative arrays instead of indexed.
9+
There is feature parity between the two scripts as of this change. All major changes, fixes and tweaks are applied to both scripts with the exception of the reworked dependency and module installation logic which breaks expected behavior of the script.
1010

1111
#### Main changes
1212

@@ -29,7 +29,7 @@ Changes applied to both `qbt-nox-static.bash` `qbittorrent-nox-static.sh`
2929
- all build optimisation stuff moved to a unified function `_custom_flags` instead of being spread out across the script.
3030
- Alpine only - if building using native gcc on the host it will attempt to use `-flto` - does not do this on crossbuilding as it does not work.
3131
- General refactoring towards more consistent use of array data throughout the script with a preference towards associative arrays.
32-
- fixed: standard checking - checks are more targets to include os version names so as to avoid certain build bad combinations
32+
- fixed: standards checking - checks are more targets to include os version names so as to avoid certain build bad combinations
3333
- new: a new flag `-bs-e` that dumps a template `.qbt_env` file with all env vars that are unset then exits.
3434
- crossbuild toolchains won't extract every time you run the script and will also now determine if you have the correct toolchains if you change the settings and not juts assume.
3535
- many consistency tweaks, minors bug fixes and streamlining of code.

qbittorrent-nox-static.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -764,8 +764,12 @@ _debug() {
764764
_custom_flags() {
765765
# Compiler optimization flags (for CFLAGS/CXXFLAGS)
766766
qbt_optimization_flags="-O3 -pipe -fdata-sections -ffunction-sections"
767-
# Preprocessor only flags
768-
qbt_preprocessor_flags="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS"
767+
# Preprocessor only flags - _FORTIFY_SOURCE=3 has been in the GNU C Library (glibc) since version 2.34
768+
if [[ "${os_version_codename}" =~ ^(bullseye|focal)$ ]]; then
769+
qbt_preprocessor_flags="-U_FORTIFY_SOURCE -D_GLIBCXX_ASSERTIONS"
770+
else
771+
qbt_preprocessor_flags="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS"
772+
fi
769773
# Security flags for compiler
770774
qbt_security_flags="-fstack-clash-protection -fstack-protector-strong -fno-plt"
771775
# Warning control

0 commit comments

Comments
 (0)