diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2014-08-22 12:59:28 +0100 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2014-08-22 12:59:28 +0100 |
| commit | 608b3456b218ea0f7c8d37412b3a541680e6638e (patch) | |
| tree | 87de69135e84fc757ff6f044cd9cd27bbe496172 | |
| parent | 09c1dbe8ed459b16201b7d6c7408da544d6c711c (diff) | |
| download | gall-608b3456b218ea0f7c8d37412b3a541680e6638e.tar.gz | |
Remove luagit2 and integrate newer libgit2 ready for minimal C module
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile | 14 | ||||
| m--------- | libgit2 | 0 | ||||
| m--------- | luagit2 | 0 |
4 files changed, 3 insertions, 14 deletions
diff --git a/.gitmodules b/.gitmodules index 8734ea9..6f8f2a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "libgit2"] path = libgit2 url = git://git.gitano.org.uk/libgit2.git -[submodule "luagit2"] - path = luagit2 - url = git://git.gitano.org.uk/luagit2.git [submodule "extras/luacov"] path = extras/luacov url = git://git.gitano.org.uk/luacov.git @@ -30,22 +30,14 @@ cmodule: try-cmodule try-cmodule: -@$(MAKE) --no-print-directory do-cmodule -do-cmodule: lib/gall/ll/git2.so - -lib/gall/ll/git2.so: luagit2/build/git2.so - mkdir -p lib/gall/ll - cp $< $@ - -luagit2/build/git2.so: libgit2/build/gall-install-stamp - mkdir -p luagit2/build - cd luagit2/build && PKG_CONFIG_PATH="$(shell pwd)/libgit2/build/gall-install/lib/pkgconfig:$(PKG_CONFIG_PATH)" cmake -DCMAKE_C_FLAGS:STRING="$${CMAKE_C_FLAGS} -Dluaopen_git2=luaopen_gall_ll_git2" -DCMAKE_MODULE_LINKER_FLAGS="-lssl" .. - cd luagit2/build && $(MAKE) +do-cmodule: libgit2/build/gall-install-stamp libgit2/build/gall-install-stamp: mkdir -p libgit2/build cd libgit2/build && cmake -DBUILD_SHARED_LIBS:BOOLEAN=OFF -DCMAKE_INSTALL_PREFIX:PATH=$(shell pwd)/libgit2/build/gall-install .. cd libgit2/build && $(MAKE) - cd libgit2/build && $(MAKE) test + echo "DISABLED BECAUSE LIBGIT2 AUTHORS ARE MAD: cd libgit2/build && $(MAKE) test" + cd libgit2/build && ./libgit2_clar -xonline cd libgit2/build && $(MAKE) install DESTDIR="" touch $@ diff --git a/libgit2 b/libgit2 -Subproject 056f1b23599891fced002d18d716bdfdb7b8f15 +Subproject b4d00c1d2466de3558a7cc6983dce4eb2ee9843 diff --git a/luagit2 b/luagit2 deleted file mode 160000 -Subproject 8ad8200fd7e40095f152b4a3a44da12c8ee817d |