Merge branch 'more_libgit_removals' into 'master'

More libgit removals

Continued from !576

See merge request !589

config/software/gitlab-rails.rb

@@ -32,7 +32,6 @@ dependency "postgresql"
 dependency "python-docutils"
 dependency "mysql-client" if EE
 dependency "krb5"
-dependency "libgit2"
 
 source :git => "git@dev.gitlab.org:gitlab/gitlabhq.git"
 
@@ -48,7 +47,7 @@ build do
 
   bundle_without = %w{development test}
   bundle_without << "mysql" unless EE
-  bundle "config build.rugged --use-system-libraries", :env => env
+  bundle "config build.rugged --no-use-system-libraries", :env => env
   bundle "install --without #{bundle_without.join(" ")} --path=#{install_dir}/embedded/service/gem --jobs #{workers}", :env => env
 
   # In order to precompile the assets, we need to get to a state where rake can

config/software/libgit2.rb

@@ -1,47 +0,0 @@
-#
-## 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 "libgit2"
-default_version "v0.23.4"
-
-source git: "git://github.com/libgit2/libgit2.git"
-
-dependency "zlib"
-dependency "openssl"
-
-relative_path "libgit2"
-
-build_dir = "#{project_dir}/build"
-
-build do
-  env = with_standard_compiler_flags(with_embedded_path)
-  cmake_options = [
-            "-DCMAKE_SKIP_RPATH=YES",
-            "-DCMAKE_INSTALL_PREFIX=#{install_dir}/embedded",
-            "-DWITH_SSL=system",
-            "-DOPENSSL_INCLUDE_DIR:PATH=#{install_dir}/embedded/include",
-            "-DOPENSSL_LIBRARIES:FILEPATH=#{install_dir}/embedded/lib/libssl.so",
-            "-DWITH_ZLIB=system",
-            "-DZLIB_INCLUDE_DIR:PATH=#{install_dir}/embedded/include",
-            "-DZLIB_LIBRARY:FILEPATH=#{install_dir}/embedded/lib/libz.so",
-            "-DCRYPTO_LIBRARY:FILEPATH=#{install_dir}/embedded/lib/libcrypto.so",
-  ]
-  mkdir build_dir
-  command "cmake .. #{cmake_options.join(' ')}", env: env, cwd: build_dir
-  command "make -j #{workers} install", env: env, cwd: build_dir
-end