VAX fixes for git; from Jeremie Courreges-Anglas, ok benoit@

This commit is contained in:
sthen 2013-03-12 22:39:30 +00:00
parent 9cfe73dae7
commit d1baf020c3
2 changed files with 22 additions and 4 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.91 2013/03/11 10:50:04 espie Exp $
# $OpenBSD: Makefile,v 1.92 2013/03/12 22:39:30 sthen Exp $
COMMENT-main = GIT - Tree History Storage Tool
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
V = 1.8.1.2
REVISION-main = 0
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.35 2013/01/25 08:14:59 dcoppa Exp $
--- Makefile.orig Mon Jan 14 20:22:04 2013
+++ Makefile Wed Jan 23 14:53:15 2013
$OpenBSD: patch-Makefile,v 1.36 2013/03/12 22:39:31 sthen Exp $
--- Makefile.orig Mon Jan 28 20:01:51 2013
+++ Makefile Sun Feb 17 11:12:26 2013
@@ -1123,13 +1123,13 @@ ifeq ($(uname_S),FreeBSD)
HAVE_PATHS_H = YesPlease
endif
@ -27,6 +27,23 @@ $OpenBSD: patch-Makefile,v 1.35 2013/01/25 08:14:59 dcoppa Exp $
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -2486,13 +2486,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
$(LIB_FILE): $(LIB_OBJS)
- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(LIB_OBJS) && ranlib $@
$(XDIFF_LIB): $(XDIFF_OBJS)
- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(XDIFF_OBJS) && ranlib $@
$(VCSSVN_LIB): $(VCSSVN_OBJS)
- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)
+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(VCSSVN_OBJS) && ranlib $@
export DEFAULT_EDITOR DEFAULT_PAGER
@@ -2678,7 +2678,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules