opkg

Commit: b26ec0fc6ed46ddb297cb057ab7e2cc9ac627b90
Parent: 7105c5cdd142dab5f1e5f85a327a7c4b18a04aca
Author: Randy Palamar
Date:   Wed,  4 Oct 2023 22:09:22 -0600

git: set prefix based on upstream suggestion

Diffstat:
M
pkg/devel/git/config.h
 | 
5
+++++
M
pkg/devel/git/gen.lua
 | 
21
++++-----------------

2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/pkg/devel/git/config.h b/pkg/devel/git/config.h
@@ -1,8 +1,13 @@
 #define DEFAULT_EDITOR "ed"
+#define DEFAULT_GIT_TEMPLATE_DIR "share/git-core/templates"
 #define DEFAULT_PAGER ""
 #define ETC_GITATTRIBUTES "/etc/gitattributes"
 #define ETC_GITCONFIG "/etc/gitconfig"
 #define GIT_BUILT_FROM_COMMIT "43c8a30d150ecede9709c1f2527c8fba92c65f40"
+#define GIT_EXEC_PATH "libexec/git-core"
+#define GIT_HTML_PATH "share/doc/git-doc"
+#define GIT_INFO_PATH "share/info"
+#define GIT_MAN_PATH "share/man"
 #define GIT_HOST_CPU "unknown"
 #define GIT_USER_AGENT "git/" GIT_VERSION
 #define GIT_VERSION "2.42.0"
diff --git a/pkg/devel/git/gen.lua b/pkg/devel/git/gen.lua
@@ -31,14 +31,7 @@ build('hooklist', '$outdir/hook-list.h', {
 	'|', '$srcdir/generate-hooklist.sh', '$srcdir/Documentation/githooks.txt'
 })
 
-cc('setup.c', nil, {cflags=string.format(
-	[[$cflags '-D DEFAULT_GIT_TEMPLATE_DIR="%s/share/git-core/templates"']],
-	config.prefix)
-})
-cc('exec-cmd.c', nil, {cflags=string.format(
-	[[$cflags '-DFALLBACK_RUNTIME_PREFIX=""' '-D GIT_EXEC_PATH="%s/libexec/git-core"']],
-	config.prefix)
-})
+cc('exec-cmd.c', nil, {cflags=string.format([[$cflags '-DFALLBACK_RUNTIME_PREFIX="%s"']], config.prefix)})
 cc('common-main.c')
 cc('http.c')
 cc('compat/regex/regex.c', nil, {cflags='$cflags -DGAWK -DNO_MBSUPPORT'})
@@ -226,7 +219,7 @@ lib('libgit.a', [[
 	sequencer.c
 	serve.c
 	server-info.c
-	setup.c.o
+	setup.c
 	shallow.c
 	sideband.c
 	sigchain.c
@@ -368,6 +361,7 @@ local builtins = {
 	'get-tar-commit-id',
 	'grep',
 	'hash-object',
+	'help',
 	'hook',
 	'index-pack',
 	'init-db',
@@ -441,14 +435,7 @@ local builtins = {
 	'write-tree',
 }
 
-local docdefs = string.format([['-D GIT_INFO_PATH="%s/share/info"' ]]
-	.. [['-D GIT_MAN_PATH="%s/share/man"' ]]
-	.. [['-D GIT_HTML_PATH="%s/share/doc/git-doc"']],
-	config.prefix, config.prefix, config.prefix)
-cc('git.c', nil, {cflags=[[$cflags ]] .. docdefs})
-cc('builtin/help.c', nil, {cflags=[[$cflags ]] .. docdefs})
-
-exe('git', {'git.c.o', 'common-main.c.o', 'builtin/help.c.o', expand({'builtin/', builtins, '.c'}), 'libgit.a.d'})
+exe('git', {'git.c', 'common-main.c.o', expand({'builtin/', builtins, '.c'}), 'libgit.a.d'})
 file('bin/git', '755', '$outdir/git')
 
 local programs = {