git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 02/10] svn-fe: add EXTLIBS needed for parse-options

From
Dmitry Ivankov <divanorama@gmail.com>
Date
Aug 16, 2011, 09:54 UTC
Message-ID
<1313488495-2203-3-git-send-email-divanorama@gmail.com>
In-Reply-To
<1313488495-2203-1-git-send-email-divanorama@gmail.com>

Currently parse-options.o pull quite a big bunch of dependencies that are neither pulled in by svn-fe Makefile nor included in libgit.a.

Use a temporary hack: put hardcoded EXTLIBS, this may not work in all setups because /Makefile logic is not repeated. The list of extlibs is likely to be exhaustive, but one may need to adjust it.

-lcrypto is needed for SHA-1 routines unless NO_OPENSSL or BLK_SHA1 is set, -lpcre is for grep if USE_LIBPCRE is set, and -lz is needed throughout.

In the future, none of these should be needed, after a little rearranging to ensure that parse-options.o has no references to translation units that need to access the object db.

Signed-off-by: Dmitry Ivankov <divanorama@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 contrib/svn-fe/Makefile |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/contrib/svn-fe/Makefile b/contrib/svn-fe/Makefile
index bc03a3e..8b12df1 100644
--- a/contrib/svn-fe/Makefile
+++ b/contrib/svn-fe/Makefile
@@ -8,11 +8,12 @@ CFLAGS = -g -O2 -Wall
 LDFLAGS =
 ALL_CFLAGS = $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
-EXTLIBS =
+EXTLIBS = -lssl -lcrypto -lpcre -lz -lpthread
 
 GIT_LIB = ../../libgit.a
 VCSSVN_LIB = ../../vcs-svn/lib.a
-LIBS = $(VCSSVN_LIB) $(GIT_LIB) $(EXTLIBS)
+XDIFF_LIB = ../../xdiff/lib.a
+LIBS = $(VCSSVN_LIB) $(GIT_LIB) $(XDIFF_LIB) $(EXTLIBS)
 
 QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
 QUIET_SUBDIR1 =
@@ -53,11 +54,8 @@ svn-fe.1: svn-fe.txt
 		../contrib/svn-fe/$@
 	$(MV) ../../Documentation/svn-fe.1 .
 
-../../vcs-svn/lib.a: FORCE
-	$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) vcs-svn/lib.a
-
-../../libgit.a: FORCE
-	$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) libgit.a
+$(VCSSVN_LIB) $(GIT_LIB) $(XDIFF_LIB): ../../%.a: FORCE
+	$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $*.a
 
 clean:
 	$(RM) svn-fe$X svn-fe.o svn-fe.html svn-fe.xml svn-fe.1

-- 
1.7.3.4
Previous: Dmitry IvankovNext: Dmitry Ivankov
Message 3 of 11 in “vcs-svn,svn-fe add a couple of options”
  1. 00/10 vcs-svn,svn-fe add a couple of optionsDmitry Ivankov, Aug 16, 2011
  2. 01/10 svn-fe: add man target to MakefileDmitry Ivankov, Aug 16, 2011
  3. 02/10 svn-fe: add EXTLIBS needed for parse-optionsDmitry Ivankov, Aug 16, 2011
  4. 03/10 svn-fe,test-svn-fe: use parse-optionsDmitry Ivankov, Aug 16, 2011
  5. 04/10 vcs-svn: make svndump_init parameters a structDmitry Ivankov, Aug 16, 2011
  6. 05/10 vcs-svn: move commit parameters logic to svndump.cDmitry Ivankov, Aug 16, 2011
  7. 06/10 vcs-svn,svn-fe: allow to specify dump destination refDmitry Ivankov, Aug 16, 2011
  8. 07/10 vcs-svn,svn-fe: convert REPORT_FILENO to an optionDmitry Ivankov, Aug 16, 2011
  9. 08/10 vcs-svn,svn-fe: allow to disable 'progress' linesDmitry Ivankov, Aug 16, 2011
  10. 09/10 vcs-svn,svn-fe: add --incremental optionDmitry Ivankov, Aug 16, 2011
  11. 10/10 vcs-svn: add fast_export_note to create notesDmitry Ivankov, Aug 16, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.