Check-in [0fa0d3e4ac]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix libgit2 not building correctly (hopefully. test this!) Add linker and include paths from libgit2 to Tuprules.tup.
Timelines: family | ancestors | descendants | both | trunk | util_git
Files: files | file ages | folders
SHA1: 0fa0d3e4acd0cf6bf81f840b42e27b7b51eb655d
User & Date: tcg.thegamer@gmail.com 2013-05-13 00:28:14.000
Context
2013-05-13
01:32
Update README check-in: 95bfc3c3e0 user: tcg.thegamer@gmail.com tags: trunk, util_git
00:28
Fix libgit2 not building correctly (hopefully. test this!) Add linker and include paths from libgit2 to Tuprules.tup. check-in: 0fa0d3e4ac user: tcg.thegamer@gmail.com tags: trunk, util_git
2013-05-12
23:26
Fix libgit2 creating too many files that are not needed Fix output libgit2.so.0 not recorded Fix bootstrap.sh deleting config every run. Now only writes a tup.config file if it doesn't already exist. Fix libgit2.so not being added in Tupfile, due to misplaced close-parenthesis. Add -Wl,--as-needed to LDFLAGS. check-in: 5187dd12b0 user: tcg.thegamer@gmail.com tags: trunk, util_git
Changes
Unified Diff Ignore Whitespace Patch
Changes to Sourcefile.
13
14
15
16
17
18
19
20
21
22
23
24
25
	url="gittup/tup",
	configure=function( root ) end
}

deps["libgit2"] = {
	url="libgit2/libgit2",
	configure=function( root )
		io.open(root .. '/build.sh','w'):write('#!/bin/bash\ncmake . -G "Unix Makefiles"\nmake\nfor file in $(find . -iname "*.o"); do rm -rf $file; done\nrm -rf CMakeCache.txt CMakeFiles/ cmake_install.cmake Makefile tests-clar/clar.suite CTestTestfile.cmake tests-clar/.clarcache libgit2_clar\n')
		io.open(root .. '/Tupfile','w'):write(': |> bash build.sh |> libgit2.so libgit2.so.0 libgit2.so.0.18.0 libgit2.pc')
	end
}

-- vim: filetype=lua







|
|




13
14
15
16
17
18
19
20
21
22
23
24
25
	url="gittup/tup",
	configure=function( root ) end
}

deps["libgit2"] = {
	url="libgit2/libgit2",
	configure=function( root )
		io.open(root .. '/build.sh','w'):write('#!/bin/bash\ncmake .\ncmake --build . --target git2\nrm -rf CMakeCache.txt CMakeFiles/ cmake_install.cmake Makefile CTestTestfile.cmake\nmkdir tmp; mv libgit2.so* tmp; cmake --build . --target clean; mv tmp/libgit2.so.0.18.0 libgit2.so; rm -rf tmp/')
		io.open(root .. '/Tupfile','w'):write(': |> bash build.sh |> libgit2.so libgit2.pc')
	end
}

-- vim: filetype=lua
Changes to src/Tuprules.tup.
1
2
3
4
5
6
7
8
9

10

11
12
13
14
15
16
17
18
CC = @(CC)
AR = @(AR)

CFLAGS += -std=c99
CFLAGS += -Wall
CFLAGS += -Wextra
CFLAGS += -Os
CFLAGS += -Wno-unused
CFLAGS += -I@(DIR_LUA_ROOT)/src

LDFLAGS += -L@(DIR_LUA_ROOT)/src

LDFLAGS += -lm -llua -ldl
LDFLAGS += -Wl,--as-needed

ifeq (@(CC),)
	CC = gcc
endif
ifeq (@(AR),)
	AR = ar rcu








|
>
|
>
|







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
CC = @(CC)
AR = @(AR)

CFLAGS += -std=c99
CFLAGS += -Wall
CFLAGS += -Wextra
CFLAGS += -Os
CFLAGS += -Wno-unused
CFLAGS += -I../@(DIR_LUA_ROOT)/src
CFLAGS += -I../@(DIR_LIBGIT2_ROOT)/src
LDFLAGS += -L../@(DIR_LUA_ROOT)/src
LDFLAGS += -L../@(DIR_LIBGIT2_ROOT)
LDFLAGS += -lm -llua -ldl -lgit2
LDFLAGS += -Wl,--as-needed

ifeq (@(CC),)
	CC = gcc
endif
ifeq (@(AR),)
	AR = ar rcu