Help with libgit2 needed to strip code copy from r-cran-git2r

2018-01-10 Thread Andreas Tille
Hi, r-cran-git2r was rejected by ftpmaster[1] due to the code copy of libgit2. I intended to fix this by removing the code copy and linking against the Debian packaged libgit2. The attempt to do so can be found in Git[2]. Unfortunately that seems to be not as simple as I was hoping for since I'

Re: Help with libgit2 needed to strip code copy from r-cran-git2r

2018-01-10 Thread Philip Rinn
Hi, I looked into this as well this evening and didn't really understand what they are doing. Did you ask the upstream authors why they didn't just depend on libgit2 as they did for libssh2, OpenSSL, ...? It's probably easier to understand the problem with their help. [If you don't want to do t

Re: Help with libgit2 needed to strip code copy from r-cran-git2r

2018-01-10 Thread Aaron M. Ucko
Andreas Tille writes: > Hi, Hi, Andreas. > gcc -std=gnu99 -I/usr/share/R/include -DNDEBUG -I. -I/usr/include/git2 > -DGIT_ARCH_64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DGIT_OPENSSL > -DLIBGIT2_NO_FEATURES_H -DGIT_SHA1_OPENSSL - DGIT_SSH -DGIT_CURL > -DGIT_USE_STAT_MTIM -DGIT_USE_NSEC -D

Re: Help with libgit2 needed to strip code copy from r-cran-git2r

2018-01-10 Thread Jose Luis Rivero
Curiosity drove me to give it a look. From what I understand: libgit2 seems to be multiplatform and for some of the platforms (this time Windows) they are shipping files with the same names that those that we can find in /usr/include, in this case inttypes.h. You have include in your patch to use t

Re: Help with libgit2 needed to strip code copy from r-cran-git2r

2018-01-10 Thread Jose Luis Rivero
dah .. I sent the reverse patch sorry: diff --git a/debian/patches/use_debian_packaged_libgit2.patch b/debian/patches/use_debian_packaged_libgit2.patch index c716773..ab603cd 100644 --- a/debian/patches/use_debian_packaged_libgit2.patch +++ b/debian/patches/use_debian_packaged_libgit2.patch @@ -87

Re: Help with libgit2 needed to strip code copy from r-cran-git2r

2018-01-10 Thread Andreas Tille
Hi Aaron, On Wed, Jan 10, 2018 at 06:37:17PM -0500, Aaron M. Ucko wrote: > Andreas Tille writes: > > > Hi, > > Hi, Andreas. > > > gcc -std=gnu99 -I/usr/share/R/include -DNDEBUG -I. -I/usr/include/git2 > > -DGIT_ARCH_64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DGIT_OPENSSL > > -DLIBGIT2_NO_FEAT

Re: Help with libgit2 needed to strip code copy from r-cran-git2r

2018-01-10 Thread Andreas Tille
On Thu, Jan 11, 2018 at 12:58:16AM +0100, Jose Luis Rivero wrote: > dah .. I sent the reverse patch sorry: > > diff --git a/debian/patches/use_debian_packaged_libgit2.patch > b/debian/patches/use_debian_packaged_libgit2.patch > index c716773..ab603cd 100644 > --- a/debian/patches/use_debian_packag

r-cran-git2r uses private header files of libgit2 (Was: Help with libgit2 needed to strip code copy from r-cran-git2r)

2018-01-11 Thread Andreas Tille
Hi again, On Thu, Jan 11, 2018 at 08:34:09AM +0100, Andreas Tille wrote: > > # Add include paths for git2r > > -CPPFLAGS="-I. -Ilibgit2/src -Ilibgit2/include -Ilibgit2/deps/http-parser > > ${CPPFLAGS}" > > -+CPPFLAGS="-I. -I/usr/include/git2 ${CPPFLAGS}" > > ++CPPFLAGS="-I. -idirafter /usr/incl

Re: r-cran-git2r uses private header files of libgit2 (Was: Help with libgit2 needed to strip code copy from r-cran-git2r)

2018-01-11 Thread Jose Luis Rivero
Hello Andreas: On 11/01/18 15:11, Andreas Tille wrote: > Hi again, > > On Thu, Jan 11, 2018 at 08:34:09AM +0100, Andreas Tille wrote: >>> # Add include paths for git2r >>> -CPPFLAGS="-I. -Ilibgit2/src -Ilibgit2/include -Ilibgit2/deps/http-parser >>> ${CPPFLAGS}" >>> -+CPPFLAGS="-I. -I/usr/incl

Re: r-cran-git2r uses private header files of libgit2 (Was: Help with libgit2 needed to strip code copy from r-cran-git2r)

2018-01-11 Thread Dirk Eddelbuettel
I had some friendly emails with Stefan (git2r upstream) when he started the R package git2r (as I needed some features in my drat R package) and he expressed quite some frustration at working with libgit2 as it changed so much upstream. I know we collectively really hate embedding copies, but r-c

Re: r-cran-git2r uses private header files of libgit2 (Was: Help with libgit2 needed to strip code copy from r-cran-git2r)

2018-01-12 Thread Andreas Tille
Hi Dirk, On Thu, Jan 11, 2018 at 10:51:45AM -0600, Dirk Eddelbuettel wrote: > > I had some friendly emails with Stefan (git2r upstream) when he started the R > package git2r (as I needed some features in my drat R package) and he > expressed quite some frustration at working with libgit2 as it ch