From: Patrick Mauritz <oxygene@studentenbude.ath.cx>
To: git@vger.kernel.org
Subject: patches
Date: Tue, 06 Sep 2005 01:24:03 +0200 [thread overview]
Message-ID: <1125962642.15293.20.camel@divert> (raw)
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
Hi,
attached are two patches:
the first fixes some build issues on solaris10/x86 with sunpro (and some
that also happen with gcc), while the second adds a simple way to add
additional search and link paths for curl library and headers.
patrick mauritz
(not on the list, please Cc:)
[-- Attachment #2: patch-20050817-1-build --]
[-- Type: text/x-patch, Size: 1229 bytes --]
diff -ur git-core-0.99.4.orig/convert-cache.c git-core-0.99.4/convert-cache.c
--- git-core-0.99.5.orig/convert-cache.c Wed Aug 17 09:55:00 2005
+++ git-core-0.99.5/convert-cache.c Wed Aug 17 09:58:48 2005
@@ -1,4 +1,5 @@
#define _XOPEN_SOURCE /* glibc2 needs this */
+#define __EXTENSIONS__ /* solaris needs this */
#include <time.h>
#include <ctype.h>
#include "cache.h"
diff -ur git-core-0.99.4.orig/ident.c git-core-0.99.4/ident.c
--- git-core-0.99.5.orig/ident.c Wed Aug 17 09:55:00 2005
+++ git-core-0.99.5/ident.c Wed Aug 17 09:57:54 2005
@@ -36,12 +36,13 @@
memcpy(real_email, pw->pw_name, len);
real_email[len++] = '@';
gethostname(real_email + len, sizeof(real_email) - len);
+#ifndef __sun
if (!strchr(real_email+len, '.')) {
len = strlen(real_email);
real_email[len++] = '.';
getdomainname(real_email+len, sizeof(real_email)-len);
}
-
+#endif
/* And set the default date */
datestamp(real_date, sizeof(real_date));
return 0;
--- git-core-0.99.5/Makefile~ Thu Aug 25 03:54:24 2005
+++ git-core-0.99.5/Makefile Tue Sep 6 01:18:32 2005
@@ -146,7 +146,11 @@
endif
endif
endif
+ifeq ($(shell uname -s),SunOS)
+ LIBS += -lsocket
+endif
+
DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
[-- Attachment #3: patch-20050906-2-curl --]
[-- Type: text/plain, Size: 609 bytes --]
--- git-core-0.99.5/Makefile~ Tue Sep 6 01:13:29 2005
+++ git-core-0.99.5/Makefile Tue Sep 6 01:15:40 2005
@@ -34,7 +34,14 @@
GIT_VERSION = 0.99.5
-CFLAGS = -g -O2 -Wall
+ifndef COPTS
+COPTS = -g -O2 -Wall
+endif
+CFLAGS = $(COPTS)
+ifdef CURLDIR
+CFLAGS+=-I$(CURLDIR)/include
+endif
+
ALL_CFLAGS = $(CFLAGS) $(DEFINES)
prefix = $(HOME)
@@ -172,7 +179,11 @@
git-ssh-pull: rsh.o pull.o
git-ssh-push: rsh.o
+ifdef CURLDIR
+git-http-pull: LIBS += -lcurl -L$(CURLDIR)/lib -R$(CURLDIR)/lib
+else
git-http-pull: LIBS += -lcurl
+endif
git-rev-list: LIBS += $(OPENSSL_LIBSSL)
init-db.o: init-db.c
next reply other threads:[~2005-09-05 23:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-05 23:24 Patrick Mauritz [this message]
2005-09-08 2:06 ` patches Junio C Hamano
2005-09-08 10:11 ` patches Patrick Mauritz
2005-09-09 22:25 ` patches Jason Riedy
2005-09-12 5:39 ` [PATCH] getdomainname should be usable on SunOS with -lnsl Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2007-11-26 2:27 patches J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1125962642.15293.20.camel@divert \
--to=oxygene@studentenbude.ath.cx \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).