Attachment 254999 Details for Bug 282593 – v1: bundled libgit2 + cleanup cmake build

[patch] v1: bundled libgit2 + cleanup cmake build

devel_rubygem-rugged.diff (text/plain), 2.26 KB, created by Nuno Teixeira on 2024-11-07 12:28:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Teixeira

Created: 2024-11-07 12:28:15 UTC

Size: 2.26 KB

patch

obsolete

>diff --git a/devel/rubygem-rugged/Makefile b/devel/rubygem-rugged/Makefile
>index 82cd322f211b..90a3defa95c2 100644
>--- a/devel/rubygem-rugged/Makefile
>+++ b/devel/rubygem-rugged/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	rugged
> PORTVERSION=	1.7.2
>-PORTREVISION=	2
>+PORTREVISION=	4
> CATEGORIES=	devel rubygems
> MASTER_SITES=	RG
> 
>@@ -13,11 +13,13 @@ WWW=		https://github.com/libgit2/rugged
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	libgit2>=${PORTVERSION:R}:devel/libgit2
>-LIB_DEPENDS=	libgit2.so:devel/libgit2 \
>-		libgmp.so:math/gmp
>+LIB_DEPENDS=	libgmp.so:math/gmp \
>+		libssh2.so:security/libssh2
> 
>-CONFIGURE_ARGS=	--use-system-libraries
>-USES=		gem pkgconfig
>+CONFIGURE_ARGS=	--with-ssh
>+USES=		cmake:indirect gem pkgconfig ssl
>+
>+post-install:
>+	${RM} -r ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/vendor/libgit2/build
> 
> .include <bsd.port.mk>
>diff --git a/devel/rubygem-rugged/files/patch-ext_rugged_extconf.rb b/devel/rubygem-rugged/files/patch-ext_rugged_extconf.rb
>deleted file mode 100644
>index 41fd2d2aed76..000000000000
>--- a/devel/rubygem-rugged/files/patch-ext_rugged_extconf.rb
>+++ /dev/null
>@@ -1,37 +0,0 @@
>-# Remove broken libgit2 detection
>-
>---- ext/rugged/extconf.rb.orig	2024-10-19 10:29:11 UTC
>-+++ ext/rugged/extconf.rb
>-@@ -65,32 +65,6 @@ if arg_config("--use-system-libraries", !!ENV['RUGGED_
>- 
>- if arg_config("--use-system-libraries", !!ENV['RUGGED_USE_SYSTEM_LIBRARIES'])
>-   puts "Building Rugged using system libraries.\n"
>--
>--  dir_config('git2').any? or pkg_config('libgit2')
>--
>--  major = minor = nil
>--
>--  File.readlines(File.join(LIBGIT2_DIR, "include", "git2", "version.h")).each do |line|
>--    if !major && (matches = line.match(/^#define LIBGIT2_VER_MAJOR\s+([0-9]+)$/))
>--      major = matches[1]
>--      next
>--    end
>--
>--    if !minor && (matches = line.match(/^#define LIBGIT2_VER_MINOR\s+([0-9]+)$/))
>--      minor = matches[1]
>--      next
>--    end
>--
>--    break if major && minor
>--  end
>--
>--  try_compile(<<-SRC) or abort "libgit2 version is not compatible, expected ~> #{major}.#{minor}.0"
>--#include <git2/version.h>
>--
>--#if LIBGIT2_VER_MAJOR != #{major} || LIBGIT2_VER_MINOR != #{minor}
>--#error libgit2 version is not compatible
>--#endif
>--  SRC
>- else
>-   if !find_executable('cmake')
>-     abort "ERROR: CMake is required to build Rugged."

Actions: View | Diff

Attachments on bug 282593: 254997 | 254999