-
Notifications
You must be signed in to change notification settings - Fork 2
For both x86 and x86_64: #3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
OoMrFlibble
wants to merge
15
commits into
OoliteProject:master
Choose a base branch
from
OoMrFlibble:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or 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
Deleted all in lib except: libSDL-1.2.so.0 libespeak.so.1 libespeak.so.1.pulseaudio libogg.so.0 libopenal.so.1 libpng14.so.14 libvorbis.so.0 libvorbisfile.so.3 libz.so.1 Renamed lib to lib-static modified make_so_links.sh to More loosely match library versions. Create lib directory. Copy files from lib-static to lib. Copy to lib from the build host the libraries to run Oolite on a newer system. Added 'clean' argument to remove all created links/files.
I think there's a stray deleteme file in x86/lib-static which can be safely zapped. Figured easier to mention here than to redo the PR for such a simple tweak. Test pre-release https://github.com/OoMrFlibble/oolite/releases/tag/1.91.0.7712-250620-459153a |
Waiting on a confirmation for the merge. @oocube , are we good to go? |
…default, as that seems well supported. If anyone wants to use the alsa variant on a modern system they'll need to install pipewire-alsa.
…default, as that seems well supported. If anyone wants to use the alsa variant on a modern system they'll need to install pipewire-alsa.
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.
If this PR is accepted, the Oolite source will need the Linux-deps submodule tweaked to point to the relevant commit.
This should allow building the Linux self-extract installer on for example Ubuntu 21, and be able to run the resulting Oolite on Ubuntu 22. If one builds on a new system and tries to run on n older system that will fail. With this bundling method, we don't need so often to manually cherry-pick the libraries from the build host to allow execution on a newer distro.
I've observed which Linux-deps/include files are used, and reduced the binary libraries kept in the source tree to those which look like they actually need bundling from the ancient build.
I've tested building on x86_64 LinuxMint 21.3. Installer works on 22.1. I'd expect it to work as well if building on an older system (might be relevant for AppImage)
Not tested i386. Library paths in the script are copied from LMDE6.
The list below is a summary of what I've done for both x86 and x86_64
Deleted all in lib except:
libSDL-1.2.so.0
libespeak.so.1
libespeak.so.1.pulseaudio
libogg.so.0
libopenal.so.1
libpng14.so.14
libvorbis.so.0
libvorbisfile.so.3
libz.so.1
Renamed lib to lib-static, allowing easier cleanup.
modified make_so_links.sh to
Create lib directory.
Copy files from lib-static to lib.
Copy to lib from the build host the libraries to run Oolite on a newer system.
More loosely match library versions when symlinking.
New: 'clean' argument to remove all created links/files.