Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
setting correct dependencies, fixed patches
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,13 @@ | ||
| --- a/Makefile 2016-07-06 16:00:08.018383300 -0400 | ||
| +++ b/Makefile 2016-07-06 16:07:00.211648100 -0400 | ||
| @@ -18,18 +18,33 @@ | ||
| # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | ||
| # IN THE SOFTWARE. | ||
|
|
||
| +VERSION_MAJ = 2 | ||
| +VERSION_MIN = 7 | ||
| +VERSION_PCH = 0 | ||
| + | ||
| PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"') | ||
| +ifeq ($(findstring cygwin,$(PLATFORM)), cygwin) | ||
| +PLATFORM = winnt | ||
|
|
@@ -19,23 +20,23 @@ index 5f4eb22..983f669 100644 | |
| BINEXT ?= | ||
| ifeq (darwin,$(PLATFORM)) | ||
| -SONAME ?= libhttp_parser.2.7.0.dylib | ||
| +SONAME ?= libhttp_parser.$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PCH).dylib | ||
| SOEXT ?= dylib | ||
| +else ifeq (winnt, $(PLATFORM)) | ||
| +CC = gcc | ||
| +SONAME ?= libhttp_parser-$(VERSION_MAJ).$(VERSION_MIN).dll | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
wildart
Author
Member
|
||
| +SOEXT ?= dll | ||
| else ifeq (wine,$(PLATFORM)) | ||
| CC = winegcc | ||
| BINEXT = .exe.so | ||
| HELPER = wine | ||
| else | ||
| -SONAME ?= libhttp_parser.so.2.7.0 | ||
| +SONAME ?= libhttp_parser.so.$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PCH) | ||
| SOEXT ?= so | ||
| endif | ||
|
|
||
| @@ -50,7 +65,12 @@ | ||
| CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA) | ||
| CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA) | ||
| CFLAGS_BENCH = $(CFLAGS_FAST) -Wno-unused-parameter | ||
|
|
@@ -45,15 +46,15 @@ index 5f4eb22..983f669 100644 | |
| +else | ||
| CFLAGS_LIB = $(CFLAGS_FAST) -fPIC | ||
| +endif | ||
|
|
||
| LDFLAGS_LIB = $(LDFLAGS) -shared | ||
|
|
||
| @@ -141,7 +161,7 @@ | ||
| rm -f *.o *.a tags test test_fast test_g \ | ||
| http_parser.tar libhttp_parser.so.* \ | ||
| url_parser url_parser_g parsertrace parsertrace_g \ | ||
| - *.exe *.exe.so | ||
| + *.exe *.exe.so *.dll | ||
|
|
||
| contrib/url_parser.c: http_parser.h | ||
| contrib/parsertrace.c: http_parser.h | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,65 @@ | ||
| diff --git a/src/settings.c b/src/settings.c | ||
| index 00a3ef0..21430bc 100644 | ||
| --- a/src/settings.c | ||
| +++ b/src/settings.c | ||
| @@ -29,9 +29,7 @@ int git_libgit2_features(void) | ||
| #ifdef GIT_THREADS | ||
| | GIT_FEATURE_THREADS | ||
| #endif | ||
| -#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) | ||
| | GIT_FEATURE_HTTPS | ||
| -#endif | ||
| #if defined(GIT_SSH) | ||
| | GIT_FEATURE_SSH | ||
| #endif | ||
| diff --git a/src/transport.c b/src/transport.c | ||
| index 327052f..32f8464 100644 | ||
| --- a/src/transport.c | ||
| +++ b/src/transport.c | ||
| @@ -29,9 +29,7 @@ static transport_definition local_transport_definition = { "file://", git_transp | ||
| static transport_definition transports[] = { | ||
| { "git://", git_transport_smart, &git_subtransport_definition }, | ||
| { "http://", git_transport_smart, &http_subtransport_definition }, | ||
| -#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) | ||
| { "https://", git_transport_smart, &http_subtransport_definition }, | ||
| -#endif | ||
| { "file://", git_transport_local, NULL }, | ||
| #ifdef GIT_SSH | ||
| { "ssh://", git_transport_smart, &ssh_subtransport_definition }, | ||
| diff --git a/src/transports/http.c b/src/transports/http.c | ||
| index 4fbbfbb..30520a0 100644 | ||
| --- a/src/transports/http.c | ||
| +++ b/src/transports/http.c | ||
| @@ -620,7 +620,6 @@ static int http_connect(http_subtransport *t) | ||
|
|
||
| error = git_stream_connect(t->io); | ||
|
|
||
| -#if defined(GIT_OPENSSL) || defined(GIT_SECURE_TRANSPORT) || defined(GIT_CURL) | ||
| if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL && | ||
| git_stream_is_encrypted(t->io)) { | ||
| git_cert *cert; | ||
| @@ -640,7 +639,7 @@ static int http_connect(http_subtransport *t) | ||
| return error; | ||
| } | ||
| } | ||
| -#endif | ||
| + | ||
| if (error < 0) | ||
| return error; | ||
|
|
||
| diff --git a/tests/core/features.c b/tests/core/features.c | ||
| index 85cddfe..cf5e190 100644 | ||
| --- a/tests/core/features.c | ||
| +++ b/tests/core/features.c | ||
| @@ -17,11 +17,7 @@ void test_core_features__0(void) | ||
| cl_assert((caps & GIT_FEATURE_THREADS) == 0); | ||
| #endif | ||
|
|
||
| -#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) | ||
| cl_assert((caps & GIT_FEATURE_HTTPS) != 0); | ||
| -#else | ||
| - cl_assert((caps & GIT_FEATURE_HTTPS) == 0); | ||
| -#endif | ||
|
|
||
| #if defined(GIT_SSH) | ||
| cl_assert((caps & GIT_FEATURE_SSH) != 0); |
no dots at all. just don't bother with an soname on Windows. I really don't see why you need to patch this at all