[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master-tx, updated. v0.9.15-test5
Lennart Poettering
gitmailer-noreply at 0pointer.de
Thu Mar 5 05:38:53 PST 2009
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master-tx branch has been updated
from c589da7e08290d48e4aa4afff8870e47abf60eea (commit)
- Log -----------------------------------------------------------------
47bc3b7... prepare test5
21547d7... Properly check for versioning flags.
cad3dd2... Make sure to set 'no' on the variable cached.
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 22 ++++++++++++----------
m4/attributes.m4 | 2 +-
src/Makefile.am | 20 ++++----------------
3 files changed, 17 insertions(+), 27 deletions(-)
-----------------------------------------------------------------------
commit cad3dd2887db52490149b48e5a108b55ff6d2c4e
Author: Diego Elio 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Thu Mar 5 13:59:53 2009 +0100
Make sure to set 'no' on the variable cached.
diff --git a/m4/attributes.m4 b/m4/attributes.m4
index 9c4a0c8..65f8378 100644
--- a/m4/attributes.m4
+++ b/m4/attributes.m4
@@ -63,7 +63,7 @@ AC_DEFUN([CC_CHECK_LDFLAGS], [
LDFLAGS="$LDFLAGS $1"
AC_LINK_IFELSE([int main() { return 1; }],
[eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"],
- [eval "AS_TR_SH([cc_cv_ldflags_$1])="])
+ [eval "AS_TR_SH([cc_cv_ldflags_$1])='no'"])
LDFLAGS="$ac_save_LDFLAGS"
])
commit 21547d7e1daf4a8c194a14fecae76ca283586662
Author: Diego Elio 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Thu Mar 5 13:59:59 2009 +0100
Properly check for versioning flags.
Instead of checking for GNU ld presence, check if the linker knows about
the -version-script flag. Non-GNU linkers may export the same interface.
It also allows to check for alternative syntax for symbol versioning.
diff --git a/configure.ac b/configure.ac
index 482efa7..214d190 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,15 +96,6 @@ if test "x$M4" = xno ; then
AC_MSG_ERROR([m4 missing])
fi
-# Linker
-
-AC_PROG_LD
-AC_PROG_LD_GNU
-
-AC_SUBST(HAVE_GNU_LD)
-AM_CONDITIONAL([HAVE_GNU_LD], [test "x$HAVE_GNU_LD" = x1])
-
-
dnl Compiler flags
DESIRED_FLAGS="-Wall -W -Wextra -pipe -Wno-long-long -Winline -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing=2 -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option"
@@ -112,6 +103,17 @@ for flag in $DESIRED_FLAGS ; do
CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"])
done
+dnl Linker flags.
+dnl Check whether the linker supports the -version-script option.
+
+dnl This variable is used to make sure ${srcdir} is expanded and not
+dnl passed to the CC_CHECK_LDFLAGS macro as a name.
+tmp_ldflag="-Wl,-version-script=${srcdir}/src/map-file"
+
+CC_CHECK_LDFLAGS([${tmp_ldflag}],
+ [VERSIONING_LDFLAGS='-Wl,-version-script=$(srcdir)/map-file'])
+AC_SUBST([VERSIONING_LDFLAGS])
+
dnl Check whether to build tests by default (as compile-test) or not
AC_ARG_ENABLE([default-build-tests],
AS_HELP_STRING([--disable-default-build-tests], [Build test programs only during make check]))
diff --git a/src/Makefile.am b/src/Makefile.am
index 09bd972..a99e275 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -715,10 +715,7 @@ libpulse_la_SOURCES = \
libpulse_la_CFLAGS = $(AM_CFLAGS)
libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon- at PA_MAJORMINORMICRO@.la
-libpulse_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO)
-if HAVE_GNU_LD
-libpulse_la_LDFLAGS += -Wl,-version-script=$(srcdir)/map-file
-endif
+libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO)
if HAVE_X11
libpulse_la_SOURCES += pulse/client-conf-x11.c pulse/client-conf-x11.h
@@ -729,26 +726,17 @@ endif
libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h
libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon- at PA_MAJORMINORMICRO@.la
-libpulse_simple_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPULSE_SIMPLE_VERSION_INFO)
-if HAVE_GNU_LD
-libpulse_simple_la_LDFLAGS += -Wl,-version-script=$(srcdir)/map-file
-endif
+libpulse_simple_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_SIMPLE_VERSION_INFO)
libpulse_browse_la_SOURCES = pulse/browser.c pulse/browser.h pulsecore/avahi-wrap.c pulsecore/avahi-wrap.h
libpulse_browse_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
libpulse_browse_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon- at PA_MAJORMINORMICRO@.la $(AVAHI_LIBS)
-libpulse_browse_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPULSE_BROWSE_VERSION_INFO)
-if HAVE_GNU_LD
-libpulse_browse_la_LDFLAGS += -Wl,-version-script=$(srcdir)/map-file
-endif
+libpulse_browse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_BROWSE_VERSION_INFO)
libpulse_mainloop_glib_la_SOURCES = pulse/glib-mainloop.h pulse/glib-mainloop.c
libpulse_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
libpulse_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon- at PA_MAJORMINORMICRO@.la $(GLIB20_LIBS)
-libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO)
-if HAVE_GNU_LD
-libpulse_mainloop_glib_la_LDFLAGS += -Wl,-version-script=$(srcdir)/map-file
-endif
+libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO)
###################################
# OSS emulation #
commit 47bc3b76fbdbeee915c50b3371899057b7fbbbcf
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 5 14:31:15 2009 +0100
prepare test5
diff --git a/configure.ac b/configure.ac
index 214d190..029899c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define(pa_major, [0])
m4_define(pa_minor, [9])
m4_define(pa_micro, [15])
-AC_INIT([pulseaudio],[pa_major.pa_minor.pa_micro-test4],[mzchyfrnhqvb (at) 0pointer (dot) net])
+AC_INIT([pulseaudio],[pa_major.pa_minor.pa_micro-test5],[mzchyfrnhqvb (at) 0pointer (dot) net])
AC_CONFIG_SRCDIR([src/daemon/main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list