Hello community, here is the log from the commit of package libmatroska for openSUSE:Factory checked in at 2014-08-13 17:19:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmatroska (Old) and /work/SRC/openSUSE:Factory/.libmatroska.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmatroska" Changes: -------- --- /work/SRC/openSUSE:Factory/libmatroska/libmatroska.changes 2014-08-08 10:10:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmatroska.new/libmatroska.changes 2014-08-13 17:19:52.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 6 08:44:10 UTC 2014 - [email protected] + +- Add libmatroska-heed-ldflags.diff so that make places LDFLAGS + onto the command line for generating the .so file + +------------------------------------------------------------------- New: ---- libmatroska-heed-ldflags.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmatroska.spec ++++++ --- /var/tmp/diff_new_pack.cBHvhH/_old 2014-08-13 17:19:53.000000000 +0200 +++ /var/tmp/diff_new_pack.cBHvhH/_new 2014-08-13 17:19:53.000000000 +0200 @@ -25,8 +25,12 @@ License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://www.matroska.org/ + +#Git-Clone: git://github.com/Matroska-Org/libmatroska +#Git-Web: https://github.com/Matroska-Org/libmatroska Source0: http://dl.matroska.org/downloads/libmatroska/%{name}-%{version}.tar.bz2 Source1: baselibs.conf +Patch1: libmatroska-heed-ldflags.diff BuildRequires: gcc-c++ BuildRequires: libebml-devel >= 1.3.0 @@ -57,13 +61,20 @@ %prep %setup -q +%patch -P 1 -p1 FAKE_BUILDTIMESTAMP=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%a %b %e %H:%M:%S %Y') sed -i "s/__TIMESTAMP__/\"$FAKE_BUILDTIMESTAMP\"/" matroska/KaxVersion.h %build cd make/linux export CXXFLAGS='%{optflags}' -make %{?_smp_mflags} link=shared +# mkvmerge-7.1.0 built against libmatroska-1.4.1 running against +# libmatroska-1.4.0: symbol lookup error: mkvmerge: undefined symbol: +# _ZN11libmatroska14KaxSeekPreRoll10ClassInfosE. +# Force versioning, since upstream did not track the ABI changes. +echo "V_%version { global: *; };" >libmatroska.sym +make %{?_smp_mflags} link=shared \ + LDFLAGS="-Wl,--version-script=$PWD/libmatroska.sym" %install cd make/linux ++++++ libmatroska-heed-ldflags.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2014-08-06 10:43:22.819663128 +0200 This hand-written Makefile ignored LDFLAGS. _NOT_ nice. --- make/linux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libmatroska-1.4.1/make/linux/Makefile =================================================================== --- libmatroska-1.4.1.orig/make/linux/Makefile +++ libmatroska-1.4.1/make/linux/Makefile @@ -104,7 +104,7 @@ $(LIBRARY): $(objects) $(RANLIB) $@ $(LIBRARY_SO): $(objects_so) - $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml + $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) ${LINKFLAGS} -lebml rm -f $(LIBRARY_SO) ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
