diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2007-05-17 15:46:17 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2007-05-17 15:46:17 +0000 |
| commit | bdadc136b218260c86e104495218a3688cd1429d (patch) | |
| tree | 624f2e2a9f5b68cd75580e63f3096dff1ddaace3 | |
| parent | cc9a75adcb3bd50fe376d8185944f85a43332a4f (diff) | |
Fix the build on MacOSX. since the one shipped by Apple is from the middle ages and is packed with issues.
Original commit message from CVS:
* configure.ac:
* ext/ffmpeg/Makefile.am:
* ext/libpostproc/Makefile.am:
Fix the build on MacOSX.
This requires a recent enough version of libtool (ex : 1.5.22), since
the one shipped by Apple is from the middle ages and is packed with
issues.
Fixes #435742
| -rw-r--r-- | ChangeLog | 11 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | ext/ffmpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | ext/libpostproc/Makefile.am | 2 |
5 files changed, 25 insertions, 2 deletions
@@ -1,3 +1,14 @@ +2007-05-17 Edward Hervey <edward@fluendo.com> + + * configure.ac: + * ext/ffmpeg/Makefile.am: + * ext/libpostproc/Makefile.am: + Fix the build on MacOSX. + This requires a recent enough version of libtool (ex : 1.5.22), since + the one shipped by Apple is from the middle ages and is packed with + issues. + Fixes #435742 + 2007-05-09 Edward Hervey <edward@fluendo.com> * ext/ffmpeg/gstffmpeg.c: (gst_ffmpeg_av_find_stream_info): diff --git a/common b/common -Subproject 61edc2dc7b8eba179d85a6545e46e0d65239e94 +Subproject b5971d76ccd216c27e095c02c3a369a9d05cb36 diff --git a/configure.ac b/configure.ac index 88b58e7..b345067 100644 --- a/configure.ac +++ b/configure.ac @@ -171,6 +171,18 @@ dnl check for "check", unit testing library/header AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no) AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") +dnl Add MacOSX specific flags +AC_CANONICAL_HOST +case $host_os in + darwin*) + DARWIN_LDFLAGS="-Wl,-read_only_relocs,suppress" + ;; + *) + DARWIN_LDFLAGS="" + ;; +esac +AC_SUBST(DARWIN_LDFLAGS) + dnl *** configure external libs *** HAVE_FFMPEG_UNINSTALLED=1 diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am index 71514af..61dd97a 100644 --- a/ext/ffmpeg/Makefile.am +++ b/ext/ffmpeg/Makefile.am @@ -14,7 +14,7 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ $(FFMPEG_CFLAGS) libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS) -libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) if HAVE_FFMPEG_UNINSTALLED libgstffmpeg_la_DEPENDENCIES = $(FFMPEG_LIBS) diff --git a/ext/libpostproc/Makefile.am b/ext/libpostproc/Makefile.am index 6df8656..b6aded8 100644 --- a/ext/libpostproc/Makefile.am +++ b/ext/libpostproc/Makefile.am @@ -8,4 +8,4 @@ libgstpostproc_la_LIBADD = -lgstvideo-@GST_MAJORMINOR@ \ $(POSTPROC_LIBS) \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS) -libgstpostproc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstpostproc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) |