Skip to content

updpatch: gitlab 17.10.1-1#4635

Merged
felixonmars merged 1 commit intofelixonmars:masterfrom
saeziae:gitlab
Apr 14, 2025
Merged

updpatch: gitlab 17.10.1-1#4635
felixonmars merged 1 commit intofelixonmars:masterfrom
saeziae:gitlab

Conversation

@saeziae
Copy link
Copy Markdown
Contributor

@saeziae saeziae commented Mar 31, 2025

  • resolve conflict
  • patch nokogiri
  • original rbtrace patch is modified because compiling should not be in the prepare() part

Comment thread gitlab/riscv64.patch
bundle config --local deployment true
bundle config --local without 'development test aws kerberos'
+ # override nokogiri build flags
+ bundle config --local build.nokogiri "--use-system-libraries --enable-shared --disable-static --with-cflags='-O2'"
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering if this should be upstreamed to Arch Linux. 🤔

Copy link
Copy Markdown
Contributor Author

@saeziae saeziae Mar 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change is from observing arch's own ruby-nokogiri's building process, i have no idea why upstream archlinux doesn't meet this error.

originally inside gitlab: --disable-shared --enable-static CFLAGS=-fPIC

arch ruby-nokogiri alone: --enable-shared --disable-static

upd:

maybe they met some similar? as

bundle config --local build.gpgme --use-system-libraries # See https://bugs.archlinux.org/task/63654
bundle config --local build.re2 --enable-system-libraries # See https://gitlab.archlinux.org/archlinux/packaging/packages/gitlab/-/issues/5

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello again. I don't know if upstreaming it to arch linux is up to the code of conduct, because according to investigation, x86 uses the prebuilt gem, so they are not compiling it natively. Adding this line to x86 build does no difference, the upside is that it will not affect the compiling behaviour, the downside, however, is that it is actually a meaningless line on x86 packing process.

@felixonmars felixonmars merged commit c5aa16c into felixonmars:master Apr 14, 2025
1 check passed
@felixonmars
Copy link
Copy Markdown
Owner

I'm merging now. But in the long run it would still be better to try to resolve it on upstream side. There are multiple ways forward (and they are not conflicting each other!):

  • Provide prebuilt riscv64 binary
  • Provide flag/env to always build from source, and ask Arch to use it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants