Re: [PATCH, v3] Potential solution to librt issue.

Top Page

Reply to this message
Author: Chris Fairles
Date:  
To: Paolo Bonzini
CC: libstdc++, gcc-patches, Paolo Carlini
Subject: Re: [PATCH, v3] Potential solution to librt issue.
On Wed, Jul 23, 2008 at 7:43 AM, Paolo Bonzini <bonzini@???> wrote:
>
>>> libstdc___la_DEPENDENCIES = ${version_dep} \
>>> $(top_builddir)/libmath/libmath.la \
>>> $(top_builddir)/libsupc++/libsupc++convenience.la
>>
>> Updated patch w/ suggested changes. Changelog remains the same.
>
> You did not update libstdc___la_DEPENDENCIES, because GLIBCXX_LIBS does not
> belong there. :-)
>
> Paolo
>


Oh yeah. It does tack libadd on the end doesn't it. Updated (its
early, eyes aren't working yet).

Chris
Index: acinclude.m4
===================================================================
--- acinclude.m4    (revision 138084)
+++ acinclude.m4    (working copy)
@@ -1017,10 +1017,18 @@
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
ac_save_CXXFLAGS="$CXXFLAGS"
+ ac_save_LIBS="$LIBS"
+
CXXFLAGS="$CXXFLAGS -fno-exceptions"
+
+ AC_SEARCH_LIBS(clock_gettime, [rt posix4])

+ case "$ac_cv_search_clock_gettime" in
+ -l*) GLIBCXX_LIBS=$ac_cv_search_clock_gettime
+ esac
+
AC_CHECK_HEADERS(unistd.h, ac_has_unistd_h=yes, ac_has_unistd_h=no)
-
+
ac_has_clock_monotonic=no;
ac_has_clock_realtime=no;
if test x"$ac_has_unistd_h" = x"yes"; then
@@ -1050,7 +1058,7 @@

AC_MSG_RESULT($ac_has_clock_realtime)
fi
-
+
if test x"$ac_has_clock_monotonic" = x"yes"; then
AC_DEFINE(_GLIBCXX_USE_CLOCK_MONOTONIC, 1,
[ Defined if clock_gettime has monotonic clock support. ])
@@ -1061,7 +1069,10 @@
[ Defined if clock_gettime has realtime clock support. ])
fi

+ AC_SUBST(GLIBCXX_LIBS)
+
CXXFLAGS="$ac_save_CXXFLAGS"
+ LIBS="$ac_save_LIBS"
AC_LANG_RESTORE
])

Index: src/Makefile.am
===================================================================
--- src/Makefile.am    (revision 138084)
+++ src/Makefile.am    (working copy)
@@ -196,10 +196,14 @@
libstdc___la_SOURCES = $(sources)

libstdc___la_LIBADD = \
+    $(GLIBCXX_LIBS) \
    $(top_builddir)/libmath/libmath.la \
    $(top_builddir)/libsupc++/libsupc++convenience.la

-libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD)
+libstdc___la_DEPENDENCIES = \
+    ${version_dep} \
+    $(top_builddir)/libmath/libmath.la \
+    $(top_builddir)/libsupc++/libsupc++convenience.la

libstdc___la_LDFLAGS = \
    -version-info $(libtool_VERSION) ${version_arg} -lm