No multiarch out of tree #32
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Thaodan
force-pushed
the
no_multiarch_out_of_tree
branch
13 times, most recently
from
2d657cb to
5558364
Compare
Thaodan
force-pushed
the
no_multiarch_out_of_tree
branch
2 times, most recently
from
eda7b44 to
5ad4f24
Compare
Thaodan
force-pushed
the
no_multiarch_out_of_tree
branch
from
5ad4f24 to
bbd5c5d
Compare
Thaodan
force-pushed
the
no_multiarch_out_of_tree
branch
2 times, most recently
from
bb58b38 to
b43cf32
Compare
Thaodan
force-pushed
the
no_multiarch_out_of_tree
branch
12 times, most recently
from
31682fd to
5f583d7
Compare
Thaodan
force-pushed
the
no_multiarch_out_of_tree
branch
7 times, most recently
from
df19e77 to
95bb81f
Compare
direc85
reviewed
Jan 29, 2025
direc85
reviewed
Jan 29, 2025
By detecting if configure.ac has changed and thus configure will change in the following step we can run autogen.sh and config.status to rerun configure with the previously set built options. The change removes the need for .configure file, correctly detects if configures sources changed and doesn't run configure again without all the previously passed options. Signed-off-by: Björn Bidar <[email protected]>
In case the root Makefile isn't in PWD assume that the Makefiles directory is the source directory. Signed-off-by: Björn Bidar <[email protected]>
Remove obsolete and unused things. Own all directories correctly (this will be an error in later RPM versions). Signed-off-by: Björn Bidar <[email protected]>
mlehtima
reviewed
Jan 29, 2025
rpm/scratchbox2.spec
Outdated
| License: LGPLv2 | ||
| URL: https://git.sailfishos.org/mer-core/scratchbox2 | ||
| Name: scratchbox2 | ||
| Version: 2.3.90+git58 | ||
| Release: 0 | ||
| Source: %{name}-%{version}.tar.gz | ||
| Prefix: /usr | ||
| ExclusiveArch: %{ix86} %{x86_64} |
There was a problem hiding this comment.
Fix this while at it, x86_64 macro is only available in rpm 4.19 or newer. So replace %{x86_64} with x86_64 for now.
Thaodan
force-pushed
the
no_multiarch_out_of_tree
branch
from
95bb81f to
d8a0c1e
Compare
direc85
requested changes
Jan 29, 2025
| License: LGPLv2 | ||
| URL: https://git.sailfishos.org/mer-core/scratchbox2 | ||
| Name: scratchbox2 | ||
| Version: 2.3.90+git58 | ||
| Release: 0 | ||
| Source: %{name}-%{version}.tar.gz | ||
| Prefix: /usr | ||
| ExclusiveArch: %{ix86} %{x86_64} | ||
| ExclusiveArch: %{ix86} %{x86_64} x86_64 |
There was a problem hiding this comment.
Either %{x86_64} is expanded or empty. Either way x86_64 works as a fallback.
| session_file=$(basename $s) | ||
| session_descr=$( grep SBOX_SESSION_DESCRIPTION $s | \ | ||
| sed 's/SBOX_SESSION_DESCRIPTION="\([^"]*\)"/\1/' ) | ||
| sed 's/SBOX_SESSION_DESCRIPTION="\([^"]*\)"/\1/' ) |
There was a problem hiding this comment.
Weird intent? Spaces vs. tabs I think?
Thaodan
force-pushed
the
no_multiarch_out_of_tree
branch
2 times, most recently
from
4c57b83 to
be98ba8
Compare
Remove useless checks like:
```
command
if [ $# -eq 0 ] ; then
error
fi
```
Or replace obsolescent -a and -o with `[ ] && [ ] ` and `[ ] || [ ]`.
https://github.com/koalaman/shellcheck/wiki/SC2166
https://github.com/koalaman/shellcheck/wiki/SC2181
Doing so exits with a clearer error message then errors about sb2d failing to start later such as these: Runtime-Error loading /tmp/sb2-bidar-20240329-145433.AwoNRb/lua_scripts/init.lua (...dar-20240329-145433.AwoNRb/lua_scripts/argvenvp_misc.lua:28: bad argument #1 to 'files' (/tmp/sb2-bidar-20240329-145433.AwoNRb/wrappers.sdk-build: No such file or directory)) sb2: Error: startup of sb2d failed. Tested-by: Björn Bidar <[email protected]>
To make it easier to detect where Scratchbox2 helper scripts and binaries are found on the host and partially on the tooling/target. This is especially important for helper binaries such as sb2dctl. Signed-off-by: Björn Bidar <[email protected]>
Signed-off-by: Björn Bidar <[email protected]>
Thaodan
force-pushed
the
no_multiarch_out_of_tree
branch
from
be98ba8 to
8f96372
Compare
The version used in the Makefile and version header was extracted using git with a phony target which resulted in unintended rebuilds. Using the autoconf script avoids these as now the version only updates when the autoconf script changes. Further the version originally set in the autoconf was also out of date. This change fixes both of these issues. The script in build-aux was taken from Gnulib. Signed-off-by: Björn Bidar <[email protected]>
Previously config.status was also clean as part of the clean making rebuilds impossible without calling configure again. Clean isn't supposed to clean the generated build- or distribution-system files. Further somefiles that should be clean where not cleaned at all. This change also aligns the name of the clean target which removes the distribution to the one configure mentions when it fails. Signed-off-by: Björn Bidar <[email protected]>
Signed-off-by: Björn Bidar <[email protected]>
When configure.ac or config.mak.in change but not their output their will be repeated rebuilds as the timestamp their output files such as config.mak stay older than their dependency. The timestamp file's timestamp will always update after the targets dependency changed. Signed-off-by: Björn Bidar <[email protected]>
Co-authored-by: Matti Viljanen <[email protected]> Co-authored-by: Björn Bidar <[email protected]> Signed-off-by: Björn Bidar <[email protected]>
In case not available. Signed-off-by: Björn Bidar <[email protected]>
Sets basic indentation across editors and reviews on Github. Signed-off-by: Björn Bidar <[email protected]>
Thaodan
force-pushed
the
no_multiarch_out_of_tree
branch
from
8f96372 to
0c2fa4e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove multilib for x86_64 and use autotools variables
d34c077
The builtin multilib support as unused. It's cleaner to built
libsb2 for 32bit targets in a 32bit worker.
The side effect of these changes is that make file pickup
the correct directories passed to configure in %configure.
Automatically detect out of tree builds
c73c772
In case the root Makefile isn't in PWD assume that the Makefiles
directory is the source directory.
Use autotools builtin system to rerun configure instead of our own
04f90b4
By detecting if configure.ac has changed and thus configure will change
in the following step we can run autogen.sh and config.status to rerun
configure with the previously set built options.
The change removes the need for .configure file, correctly detects
if configures sources changed and doesn't run configure again without
all the previously passed options.
Contains changes from #22 and #23.