From: Dennis Stosberg <dennis@stosberg.net>
To: git@vger.kernel.org
Subject: [PATCH 5/6] On Solaris nanosleep() is not in libc but in librt
Date: Tue, 15 Aug 2006 11:01:29 +0200 [thread overview]
Message-ID: <20060815090129.5223.17174.stgit@leonov.stosberg.net> (raw)
In-Reply-To: <20060815090031.5223.27458.stgit@leonov.stosberg.net>
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
---
Makefile | 11 +++++++++--
config.mak.in | 1 +
configure.ac | 10 ++++++++--
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 3cb6531..d352901 100644
--- a/Makefile
+++ b/Makefile
@@ -67,8 +67,10 @@ # Define NEEDS_SSL_WITH_CRYPTO if you ne
#
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
#
-# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
-# Patrick Mauritz).
+# Define NEEDS_SOCKET if linking with libc is not enough for socket()
+# (SunOS, Patrick Mauritz).
+#
+# Define NEEDS_RT if linking with libc is not enough for nanosleep() (SunOS)
#
# Define NO_MMAP if you want to avoid mmap.
#
@@ -336,6 +338,7 @@ endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease
NEEDS_NSL = YesPlease
+ NEEDS_RT = YesPlease
SHELL_PATH = /bin/bash
NO_STRCASESTR = YesPlease
ifeq ($(uname_R),5.8)
@@ -479,6 +482,10 @@ ifdef NEEDS_NSL
EXTLIBS += -lnsl
SIMPLE_LIB += -lnsl
endif
+ifdef NEEDS_RT
+ EXTLIBS += -lrt
+ SIMPLE_LIB += -lrt
+endif
ifdef NO_D_TYPE_IN_DIRENT
BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT
endif
diff --git a/config.mak.in b/config.mak.in
index 369e611..038767e 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -29,6 +29,7 @@ NO_CURL=@NO_CURL@
NO_EXPAT=@NO_EXPAT@
NEEDS_LIBICONV=@NEEDS_LIBICONV@
NEEDS_SOCKET=@NEEDS_SOCKET@
+NEEDS_RT=@NEEDS_RT@
NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT@
NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@
NO_SOCKADDR_STORAGE=@NO_SOCKADDR_STORAGE@
diff --git a/configure.ac b/configure.ac
index 36f9cd9..6f1d87a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,13 +148,19 @@ AC_CHECK_LIB([c], [iconv],
[NEEDS_LIBICONV=YesPlease])
AC_SUBST(NEEDS_LIBICONV)
#
-# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
-# Patrick Mauritz).
+# Define NEEDS_SOCKET if linking with libc is not enough for socket()
+# (SunOS, Patrick Mauritz).
AC_CHECK_LIB([c], [socket],
[NEEDS_SOCKET=],
[NEEDS_SOCKET=YesPlease])
AC_SUBST(NEEDS_SOCKET)
test -n "$NEEDS_SOCKET" && LIBS="$LIBS -lsocket"
+#
+# Define NEEDS_RT if linking with libc is not enough for nanosleep (SunOS)
+AC_CHECK_LIB([c], [nanosleep],
+[NEEDS_RT=],
+[NEEDS_RT=YesPlease])
+AC_SUBST(NEEDS_RT)
## Checks for header files.
next prev parent reply other threads:[~2006-08-15 9:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-15 9:00 [PATCH 0/6] Configuration tweaks for Solaris Dennis Stosberg
2006-08-15 9:01 ` [PATCH 1/6] Solaris has strlcpy() at least since version 8 Dennis Stosberg
2006-08-15 9:01 ` [PATCH 2/6] Solaris does not support C99 format strings before version 10 Dennis Stosberg
2006-08-15 9:01 ` [PATCH 3/6] Look for sockaddr_storage in sys/socket.h Dennis Stosberg
2006-08-15 9:01 ` [PATCH 4/6] Fix detection of ipv6 on Solaris Dennis Stosberg
2006-08-15 9:01 ` Dennis Stosberg [this message]
2006-08-15 10:35 ` [PATCH 5/6] On Solaris nanosleep() is not in libc but in librt Junio C Hamano
2006-07-31 16:55 ` Fix double "close()" in ce_compare_data Linus Torvalds
2006-07-31 19:05 ` Junio C Hamano
2006-08-05 11:20 ` [PATCH] Racy git: avoid having to be always too careful Junio C Hamano
2006-08-08 15:43 ` Johannes Schindelin
2006-08-08 17:25 ` Junio C Hamano
2006-08-08 22:30 ` Johannes Schindelin
2006-08-08 23:07 ` Junio C Hamano
2006-08-08 23:44 ` Johannes Schindelin
2006-08-15 20:12 ` [PATCH] Documentation/technical/racy-git.txt Junio C Hamano
2006-08-15 11:18 ` [PATCH 5/6] On Solaris nanosleep() is not in libc but in librt Alex Riesen
2006-08-15 9:01 ` [PATCH 6/6] Fix compilation with Sun CC Dennis Stosberg
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=20060815090129.5223.17174.stgit@leonov.stosberg.net \
--to=dennis@stosberg.net \
--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).