Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / gitlab
Commits: 402298ba by loqs at 2023-12-05T11:57:34+00:00 Fix build failure in re2 gem Use libre2.so provided by the re2 package avoiding the vendored version that fails to build correctly. Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/gitlab/-/issues/5 - - - - - ab7d299d by loqs at 2023-12-05T11:57:53+00:00 Enable bundler checksum verification - - - - - 87c01926 by loqs at 2023-12-05T11:57:56+00:00 Build the Rust extension for prometheus-client-mmap. There is a race during the build so unset MAKEFLAGS for that step. - - - - - 9622c496 by loqs at 2023-12-05T11:57:57+00:00 Remove now redundant call to gettext:compile. gettext:compile is called by gitlab:assets:compile [1]. [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/1bdee5568dc88d3f983e3192caf674c16e192974 - - - - - ac0657d4 by loqs at 2023-12-05T11:57:58+00:00 upgpkg: 16.6.1-1 Remove -Werror=format-security from the CFLAGS used by the C extension of the google-protobuf 3.25.0 gem which causes a build error introduced by upstream commit [1]. [1]: https://github.com/protocolbuffers/protobuf/commit/c52d80cf04274aefd557e2bc93f64bb71c097645 - - - - - 1 changed file: - PKGBUILD Changes: ===================================== PKGBUILD ===================================== @@ -9,7 +9,7 @@ # Contributor: loqs <[email protected]> pkgname=gitlab -pkgver=16.5.2 +pkgver=16.6.1 pkgrel=1 pkgdesc='Project management and code hosting application' arch=(x86_64) @@ -24,14 +24,16 @@ depends=(git openssh openssl perl-image-exiftool - re2 + re2 libre2.so redis ruby ruby-bundler) -makedepends=(cmake +makedepends=(clang + cmake go nodejs postgresql + rust yarn) optdepends=('postgresql: database backend' 'python-docutils: reStructuredText markup language support' @@ -109,11 +111,15 @@ build() { echo "Fetching bundled gems..." # Gems will be installed into vendor/bundle + # Remove -Werror=format-security from the CFLAGS used by the C extension of the google-protobuf gem + bundle config --local build.google-protobuf "-- --with-cflags='$(ruby -r rbconfig -e 'print RbConfig::CONFIG["CFLAGS"]' | sed -e 's/-Werror=format-security//')'" 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 bundle config --local force_ruby_platform true # some native gems are not available for newer ruby bundle config --local deployment true bundle config --local without 'development test aws kerberos' - BUNDLER_CHECKSUM_VERIFICATION_OPT_IN=0 bundle install --jobs=$(nproc) --no-cache + # Disable make jobserver due to a race in prometheus-client-mmap + MAKEFLAGS= BUNDLER_CHECKSUM_VERIFICATION_OPT_IN=1 bundle install --jobs=$(nproc) --no-cache export CGO_CPPFLAGS="${CPPFLAGS}" export CGO_CFLAGS="${CFLAGS}" @@ -123,7 +129,6 @@ build() { make -C workhorse yarn install --production --pure-lockfile - bundle exec rake gettext:compile RAILS_ENV=production NODE_ENV=production USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max_old_space_size=3584" bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max_old_space_size=3584" } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/gitlab/-/compare/0d09faa8cd56635d0aec477dfdadc8a4b816244c...ac0657d4f978c036256617e06f4f4a259e4d93ab -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/gitlab/-/compare/0d09faa8cd56635d0aec477dfdadc8a4b816244c...ac0657d4f978c036256617e06f4f4a259e4d93ab You're receiving this email because of your account on gitlab.archlinux.org.
