mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
libgit2, cleanup (#7984)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -1,91 +0,0 @@
|
||||
SUMMARY="A portable, pure C implementation of the Git core methods"
|
||||
DESCRIPTION="The library provides:
|
||||
* SHA conversions, formatting and shortening
|
||||
* abstracted ODB backend system
|
||||
* commit, tag, tree and blob parsing, editing, and write-back
|
||||
* tree traversal
|
||||
* revision walking
|
||||
* index file (staging area) manipulation
|
||||
* reference management (including packed references)
|
||||
* config file management
|
||||
* high level repository management
|
||||
* thread safety and reentrancy
|
||||
* descriptive and detailed error messages
|
||||
* ...and more (over 175 different API calls)"
|
||||
HOMEPAGE="http://libgit2.github.com/"
|
||||
COPYRIGHT="2005-2017 libgit2 project"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="4"
|
||||
SOURCE_URI="https://github.com/libgit2/libgit2/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="7ae8e699ff7ff9a1fa702249140ee31ea6fd556bf7968e84e38165870667bcb1"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
libgit2$secondaryArchSuffix = $portVersion
|
||||
lib:libgit2$secondaryArchSuffix = 0.25.1 compat >= 0.25
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libssh2$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
libgit2${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libgit2$secondaryArchSuffix = 0.25.1 compat >= 0.25
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libgit2$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libssh2$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:curl_config$secondaryArchSuffix
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
mkdir -p build && cd build
|
||||
|
||||
cmake .. \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
|
||||
-DBIN_INSTALL_DIR:PATH=$binDir \
|
||||
-DINCLUDE_INSTALL_DIR:PATH=$includeDir \
|
||||
-DLIB_INSTALL_DIR:PATH=$libDir \
|
||||
-DBUILD_CLAR=OFF \
|
||||
-DBUILD_EXAMPLES=OFF
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd build
|
||||
make install
|
||||
|
||||
prepareInstalledDevelLib libgit2
|
||||
fixPkgconfig
|
||||
|
||||
packageEntries devel $developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
cd build
|
||||
make check
|
||||
}
|
||||
@@ -1,104 +0,0 @@
|
||||
SUMMARY="A portable, pure C implementation of the Git core methods"
|
||||
DESCRIPTION="The library provides:
|
||||
* SHA conversions, formatting and shortening
|
||||
* abstracted ODB backend system
|
||||
* commit, tag, tree and blob parsing, editing, and write-back
|
||||
* tree traversal
|
||||
* revision walking
|
||||
* index file (staging area) manipulation
|
||||
* reference management (including packed references)
|
||||
* config file management
|
||||
* high level repository management
|
||||
* thread safety and reentrancy
|
||||
* descriptive and detailed error messages
|
||||
* ...and more (over 175 different API calls)"
|
||||
HOMEPAGE="https://libgit2.github.com/"
|
||||
COPYRIGHT="2005-2018 libgit2 project"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="4"
|
||||
SOURCE_URI="https://github.com/libgit2/libgit2/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="0da4e211dfb63c22e5f43f2a4a5373e86a140afa88a25ca6ba3cc2cae58263d2"
|
||||
SOURCE_FILENAME="libgit2-$portVersion.tar.gz"
|
||||
PATCHES="libgit2-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all ?x86"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="$portVersion"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%.*}"
|
||||
|
||||
PROVIDES="
|
||||
libgit2$secondaryArchSuffix = $portVersion
|
||||
lib:libgit2$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libssh2$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
libgit2${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libgit2$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libgit2$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libssh2$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:curl_config$secondaryArchSuffix
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
defineDebugInfoPackage libgit2$secondaryArchSuffix \
|
||||
"$libDir"/libgit2.so.$libVersion
|
||||
|
||||
BUILD()
|
||||
{
|
||||
mkdir -p build && cd build
|
||||
|
||||
OPTIONS=
|
||||
if [ $effectiveTargetArchitecture == x86_gcc2 ] ; then
|
||||
OPTIONS=-DTHREADSAFE=OFF
|
||||
fi
|
||||
|
||||
cmake .. \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
|
||||
-DBIN_INSTALL_DIR:PATH=$binDir \
|
||||
-DINCLUDE_INSTALL_DIR:PATH=$includeDir \
|
||||
-DLIB_INSTALL_DIR:PATH=$libDir \
|
||||
-DBUILD_CLAR=OFF \
|
||||
-DBUILD_EXAMPLES=OFF $OPTIONS
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd build
|
||||
make install
|
||||
|
||||
prepareInstalledDevelLib libgit2
|
||||
fixPkgconfig
|
||||
|
||||
packageEntries devel $developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
# See tests/README.md
|
||||
true
|
||||
}
|
||||
@@ -1,104 +0,0 @@
|
||||
SUMMARY="A portable, pure C implementation of the Git core methods"
|
||||
DESCRIPTION="The library provides:
|
||||
* SHA conversions, formatting and shortening
|
||||
* abstracted ODB backend system
|
||||
* commit, tag, tree and blob parsing, editing, and write-back
|
||||
* tree traversal
|
||||
* revision walking
|
||||
* index file (staging area) manipulation
|
||||
* reference management (including packed references)
|
||||
* config file management
|
||||
* high level repository management
|
||||
* thread safety and reentrancy
|
||||
* descriptive and detailed error messages
|
||||
* ...and more (over 175 different API calls)"
|
||||
HOMEPAGE="https://libgit2.github.com/"
|
||||
COPYRIGHT="2005-2018 libgit2 project"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="3"
|
||||
SOURCE_URI="https://github.com/libgit2/libgit2/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="545b0458292c786aba334f1bf1c8f73600ae73dd7205a7bb791a187ee48ab8d2"
|
||||
SOURCE_FILENAME="libgit2-$portVersion.tar.gz"
|
||||
PATCHES="libgit2-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all ?x86"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="$portVersion"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%.*}"
|
||||
|
||||
PROVIDES="
|
||||
libgit2$secondaryArchSuffix = $portVersion
|
||||
lib:libgit2$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libssh2$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
libgit2${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libgit2$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libgit2$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libssh2$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:curl_config$secondaryArchSuffix
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
defineDebugInfoPackage libgit2$secondaryArchSuffix \
|
||||
"$libDir"/libgit2.so.$libVersion
|
||||
|
||||
BUILD()
|
||||
{
|
||||
mkdir -p build && cd build
|
||||
|
||||
OPTIONS=
|
||||
if [ $effectiveTargetArchitecture = x86_gcc2 ] ; then
|
||||
OPTIONS=-DTHREADSAFE=OFF
|
||||
fi
|
||||
|
||||
cmake .. \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
|
||||
-DBIN_INSTALL_DIR:PATH=$binDir \
|
||||
-DINCLUDE_INSTALL_DIR:PATH=$includeDir \
|
||||
-DLIB_INSTALL_DIR:PATH=$libDir \
|
||||
-DBUILD_CLAR=OFF \
|
||||
-DBUILD_EXAMPLES=OFF $OPTIONS
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd build
|
||||
make install
|
||||
|
||||
prepareInstalledDevelLib libgit2
|
||||
fixPkgconfig
|
||||
|
||||
packageEntries devel $developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
# See tests/README.md
|
||||
true
|
||||
}
|
||||
@@ -1,71 +0,0 @@
|
||||
From 4036019821be1f94bed724e2ebdb2a3b6ff41670 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Thu, 10 May 2018 10:21:34 +0200
|
||||
Subject: Reorder some includes to avoid conflicts between zlib and openssl
|
||||
|
||||
zlib #defines free_func, but ssl headers use free_func in a parameter
|
||||
name in some places. This ends up confusing gcc2. Make sure the ssl
|
||||
headers are included before the define is set, so we can build libgit
|
||||
with gcc2.
|
||||
|
||||
diff --git a/src/fetch.c b/src/fetch.c
|
||||
index f408a51..9bf58fc 100644
|
||||
--- a/src/fetch.c
|
||||
+++ b/src/fetch.c
|
||||
@@ -5,6 +5,8 @@
|
||||
* a Linking Exception. For full terms see the included COPYING file.
|
||||
*/
|
||||
|
||||
+#include "netops.h"
|
||||
+
|
||||
#include "git2/oid.h"
|
||||
#include "git2/refs.h"
|
||||
#include "git2/revwalk.h"
|
||||
@@ -15,7 +17,6 @@
|
||||
#include "refspec.h"
|
||||
#include "pack.h"
|
||||
#include "fetch.h"
|
||||
-#include "netops.h"
|
||||
#include "repository.h"
|
||||
#include "refs.h"
|
||||
|
||||
diff --git a/src/pack-objects.h b/src/pack-objects.h
|
||||
index e1e0ee3..399a035 100644
|
||||
--- a/src/pack-objects.h
|
||||
+++ b/src/pack-objects.h
|
||||
@@ -8,12 +8,13 @@
|
||||
#ifndef INCLUDE_pack_objects_h__
|
||||
#define INCLUDE_pack_objects_h__
|
||||
|
||||
+#include "netops.h"
|
||||
+
|
||||
#include "common.h"
|
||||
|
||||
#include "buffer.h"
|
||||
#include "hash.h"
|
||||
#include "oidmap.h"
|
||||
-#include "netops.h"
|
||||
#include "zstream.h"
|
||||
#include "pool.h"
|
||||
#include "indexer.h"
|
||||
diff --git a/src/push.c b/src/push.c
|
||||
index 433cc06..a112fc1 100644
|
||||
--- a/src/push.c
|
||||
+++ b/src/push.c
|
||||
@@ -5,11 +5,12 @@
|
||||
* a Linking Exception. For full terms see the included COPYING file.
|
||||
*/
|
||||
|
||||
+#include "pack-objects.h"
|
||||
+
|
||||
#include "git2.h"
|
||||
|
||||
#include "common.h"
|
||||
#include "pack.h"
|
||||
-#include "pack-objects.h"
|
||||
#include "remote.h"
|
||||
#include "vector.h"
|
||||
#include "push.h"
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
From 4036019821be1f94bed724e2ebdb2a3b6ff41670 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Thu, 10 May 2018 10:21:34 +0200
|
||||
Subject: Reorder some includes to avoid conflicts between zlib and openssl
|
||||
|
||||
zlib #defines free_func, but ssl headers use free_func in a parameter
|
||||
name in some places. This ends up confusing gcc2. Make sure the ssl
|
||||
headers are included before the define is set, so we can build libgit
|
||||
with gcc2.
|
||||
|
||||
|
||||
diff --git a/src/fetch.c b/src/fetch.c
|
||||
index 0b22b36..67fdfbf 100644
|
||||
--- a/src/fetch.c
|
||||
+++ b/src/fetch.c
|
||||
@@ -5,6 +5,7 @@
|
||||
* a Linking Exception. For full terms see the included COPYING file.
|
||||
*/
|
||||
|
||||
+#include "netops.h"
|
||||
#include "fetch.h"
|
||||
|
||||
#include "git2/oid.h"
|
||||
@@ -15,7 +16,6 @@
|
||||
#include "remote.h"
|
||||
#include "refspec.h"
|
||||
#include "pack.h"
|
||||
-#include "netops.h"
|
||||
#include "repository.h"
|
||||
#include "refs.h"
|
||||
|
||||
diff --git a/src/pack-objects.h b/src/pack-objects.h
|
||||
index c9cd577..419e8a5 100644
|
||||
--- a/src/pack-objects.h
|
||||
+++ b/src/pack-objects.h
|
||||
@@ -8,12 +8,13 @@
|
||||
#ifndef INCLUDE_pack_objects_h__
|
||||
#define INCLUDE_pack_objects_h__
|
||||
|
||||
+#include "netops.h"
|
||||
+
|
||||
#include "common.h"
|
||||
|
||||
#include "buffer.h"
|
||||
#include "hash.h"
|
||||
#include "oidmap.h"
|
||||
-#include "netops.h"
|
||||
#include "zstream.h"
|
||||
#include "pool.h"
|
||||
#include "indexer.h"
|
||||
diff --git a/src/push.c b/src/push.c
|
||||
index 85b683e..9eab56e 100644
|
||||
--- a/src/push.c
|
||||
+++ b/src/push.c
|
||||
@@ -5,12 +5,13 @@
|
||||
* a Linking Exception. For full terms see the included COPYING file.
|
||||
*/
|
||||
|
||||
+#include "pack-objects.h"
|
||||
+
|
||||
#include "push.h"
|
||||
|
||||
#include "git2.h"
|
||||
|
||||
#include "pack.h"
|
||||
-#include "pack-objects.h"
|
||||
#include "remote.h"
|
||||
#include "vector.h"
|
||||
#include "tree.h"
|
||||
--
|
||||
2.16.2
|
||||
|
||||
Reference in New Issue
Block a user