diff --git a/config/projects/gitlab.rb b/config/projects/gitlab.rb index f42cc38..e2f10cc 100644 --- a/config/projects/gitlab.rb +++ b/config/projects/gitlab.rb @@ -25,7 +25,7 @@ install_path "/opt/gitlab" build_version Omnibus::BuildVersion.new.semver build_iteration 1 -override :ruby, version: '2.0.0-p451' +override :ruby, version: '2.1.1' override :rubygems, version: '2.2.1' # creates required build directories diff --git a/config/software/gitlab-rails.rb b/config/software/gitlab-rails.rb index 8d266ee..2475c0f 100644 --- a/config/software/gitlab-rails.rb +++ b/config/software/gitlab-rails.rb @@ -67,7 +67,7 @@ build do # To make this idempotent, we apply the patch (in case this is a first run) or # we revert and re-apply the patch (if this is a second or later run). command "git apply #{aato_patch} || (git apply -R #{aato_patch} && git apply #{aato_patch})", - :cwd => "#{install_dir}/embedded/service/gem/ruby/2.0.0/gems/acts-as-taggable-on-2.4.1" + :cwd => "#{install_dir}/embedded/service/gem/ruby/2.1.0/gems/acts-as-taggable-on-2.4.1" assets_precompile_env = { "RAILS_ENV" => "production", diff --git a/config/software/ruby.rb b/config/software/ruby.rb deleted file mode 100644 index b60770d..0000000 --- a/config/software/ruby.rb +++ /dev/null @@ -1,167 +0,0 @@ -# -# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc. -# Copyright:: Copyright (c) 2014 GitLab B.V. -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -name "ruby" -default_version "1.9.3-p484" - -dependency "zlib" -dependency "ncurses" -dependency "libedit" -dependency "openssl" -dependency "libyaml" -dependency "libiconv" -dependency "gdbm" -dependency "libgcc" if (platform == "solaris2" and Omnibus.config.solaris_compiler == "gcc") - -version "1.9.3-p484" do - source md5: '8ac0dee72fe12d75c8b2d0ef5d0c2968' -end - -version "2.0.0-p451" do - source md5: '9227787a9636551f1749ee8394b5ffe5' -end - -version "2.1.1" do - source md5: 'e57fdbb8ed56e70c43f39c79da1654b2' -end - -source url: "http://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz" - -relative_path "ruby-#{version}" - -env = - case platform - when "mac_os_x" - { - # -Qunused-arguments suppresses "argument unused during compilation" - # warnings. These can be produced if you compile a program that doesn't - # link to anything in a path given with -Lextra-libs. Normally these - # would be harmless, except that autoconf treats any output to stderr as - # a failure when it makes a test program to check your CFLAGS (regardless - # of the actual exit code from the compiler). - "CFLAGS" => "-arch x86_64 -m64 -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -I#{install_dir}/embedded/include/ncurses -O3 -g -pipe -Qunused-arguments", - "LDFLAGS" => "-arch x86_64 -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -I#{install_dir}/embedded/include/ncurses" - } - when "solaris2" - { - "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -O3 -g -pipe", - "LDFLAGS" => "-R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -static-libgcc", - "LD_OPTIONS" => "-R#{install_dir}/embedded/lib" - } - when "aix" - { - # see http://www.ibm.com/developerworks/aix/library/au-gnu.html - # - # specifically: - # - # "To use AIX run-time linking, you should create the shared object - # using gcc -shared -Wl,-G and create executables using the library - # by adding the -Wl,-brtl option to the link line. Technically, you - # can leave off the -shared option, but it does no harm and reduces - # confusion." - # - # AIX also uses -Wl,-blibpath instead of -R or LD_RUN_PATH, but the - # option is not additive, so requires /usr/lib and /lib as well (there - # is a -bsvr4 option to allow ld to take an -R flag in addition - # to turning on -brtl, but it had other side effects I couldn't fix). - # - # If libraries linked with gcc -shared have symbol resolution failures - # then it may be useful to add -bexpfull to export all symbols. - # - # -O2 optimized away some configure test which caused ext libs to fail - # - # We also need prezl's M4 instead of picking up /usr/bin/m4 which - # barfs on ruby. - # - "CC" => "xlc -q64", - "CXX" => "xlC -q64", - "LD" => "ld -b64", - "CFLAGS" => "-q64 -O -qhot -I#{install_dir}/embedded/include", - "CXXFLAGS" => "-q64 -O -qhot -I#{install_dir}/embedded/include", - "LDFLAGS" => "-q64 -L#{install_dir}/embedded/lib -Wl,-brtl -Wl,-blibpath:#{install_dir}/embedded/lib:/usr/lib:/lib", - "OBJECT_MODE" => "64", - "ARFLAGS" => "-X64 cru", - "M4" => "/opt/freeware/bin/m4", - "warnflags" => "-qinfo=por" - } - else - { - "CFLAGS" => "-I#{install_dir}/embedded/include -O3 -g -pipe", - "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib" - } - end - -build do - configure_command = ["./configure", - "--prefix=#{install_dir}/embedded", - "--with-out-ext=fiddle,dbm", - "--enable-shared", - "--enable-libedit", - "--with-ext=psych", - "--disable-install-doc"] - - case platform - when "aix" - patch :source => "ruby-aix-configure.patch", :plevel => 1 - patch :source => "ruby_aix_1_9_3_448_ssl_EAGAIN.patch", :plevel => 1 - # --with-opt-dir causes ruby to send bogus commands to the AIX linker - when "freebsd" - configure_command << "--without-execinfo" - configure_command << "--with-opt-dir=#{install_dir}/embedded" - when "smartos" - # Opscode patch - someara@opscode.com - # GCC 4.7.0 chokes on mismatched function types between OpenSSL 1.0.1c and Ruby 1.9.3-p286 - patch :source => "ruby-openssl-1.0.1c.patch", :plevel => 1 - - # Patches taken from RVM. - # http://bugs.ruby-lang.org/issues/5384 - # https://www.illumos.org/issues/1587 - # https://github.com/wayneeseguin/rvm/issues/719 - patch :source => "rvm-cflags.patch", :plevel => 1 - - # From RVM forum - # https://github.com/wayneeseguin/rvm/commit/86766534fcc26f4582f23842a4d3789707ce6b96 - configure_command << "ac_cv_func_dl_iterate_phdr=no" - configure_command << "--with-opt-dir=#{install_dir}/embedded" - else - configure_command << "--with-opt-dir=#{install_dir}/embedded" - end - - # @todo expose bundle_bust() in the DSL - env.merge!({ - "RUBYOPT" => nil, - "BUNDLE_BIN_PATH" => nil, - "BUNDLE_GEMFILE" => nil, - "GEM_PATH" => nil, - "GEM_HOME" => nil - }) - - # @todo: move into omnibus-ruby - has_gmake = system("gmake --version") - - if has_gmake - env.merge!({'MAKE' => 'gmake'}) - make_binary = 'gmake' - else - make_binary = 'make' - end - - command configure_command.join(" "), :env => env - command "#{make_binary} -j #{max_build_jobs}", :env => env - command "#{make_binary} -j #{max_build_jobs} install", :env => env -end -- libgit2 0.21.2