Skip to content

Commit

Permalink
configure.ac: fix FTBFS with new glibc
Browse files Browse the repository at this point in the history
Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com>
  • Loading branch information
Carsten Munk committed Oct 19, 2013
1 parent 94b9433 commit 6fdd967
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 0 deletions.
28 changes: 28 additions & 0 deletions systemd-187-fix-ftbfs.patch
@@ -0,0 +1,28 @@
From e17187091d463ad008c0b74eb04de5078b2abb96 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Wed, 14 Nov 2012 13:44:05 +0000
Subject: configure.ac: fix FTBFS with new glibc

glibc moved clock_* functions from librt to the core libc. As a result,
clock_gettime is no more a suitable symbol to use when finding librt.
Look for mq_open instead.
Reference:
http://www.sourceware.org/git/gitweb.cgi?p=glibc.git&h=6e6249d0b461b952d0f544792372663feb6d792a

Fixes a FTBFS in Fedora Rawhide.
---
diff --git a/configure.ac b/configure.ac
index c4638d1..71ea6ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,7 +171,7 @@ CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
-Wl,-z,now])
AC_SUBST([OUR_LDFLAGS], $with_ldflags)

-AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([*** POSIX RT library not found])])
+AC_SEARCH_LIBS([mq_open], [rt], [], [AC_MSG_ERROR([*** POSIX RT library not found])])
AC_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([*** Dynamic linking loader library not found])])

save_LIBS="$LIBS"
--
cgit v0.9.0.2-2-gbebe
3 changes: 3 additions & 0 deletions systemd.changes
@@ -1,3 +1,6 @@
* Sat Oct 19 2013 Carsten Munk <carsten.munk@jollamobile.com> - 187
- configure.ac: fix FTBFS with new glibc

* Wed Jun 26 2013 Carsten Munk <carsten.munk@jollamobile.com> - 187
- Add traditional droid paths to firmware searches

Expand Down
2 changes: 2 additions & 0 deletions systemd.spec
Expand Up @@ -39,6 +39,7 @@ Patch3: systemd-187-make-readahead-depend-on-sysinit.patch
Patch4: systemd-187-support-glob-EnvironmentFile.patch
Patch5: systemd-187-install-test-bin.patch
Patch6: systemd-187-remove-display-manager.service.patch
Patch7: systemd-187-fix-ftbfs.patch
Provides: udev = %{version}
Obsoletes: udev < 184

Expand Down Expand Up @@ -223,6 +224,7 @@ to replace sysvinit.
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1

%build
autoreconf
Expand Down

0 comments on commit 6fdd967

Please sign in to comment.