diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2006-11-11 16:39:06 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2006-11-11 16:39:06 +0000 |
| commit | cdbded90810e1f73e451cdbd646fc04faf89bbd0 (patch) | |
| tree | c0f08f0f8789a48a52eff8baf86aa72e49145fb0 /media-libs/mlt++/files | |
| parent | Remove old version. (diff) | |
| download | gentoo-2-cdbded90810e1f73e451cdbd646fc04faf89bbd0.tar.gz gentoo-2-cdbded90810e1f73e451cdbd646fc04faf89bbd0.tar.bz2 gentoo-2-cdbded90810e1f73e451cdbd646fc04faf89bbd0.zip | |
Adding || die to econf & emakes, as-needed patch fixing the linking order
(Portage version: 2.1.2_rc1-r5)
Diffstat (limited to 'media-libs/mlt++/files')
| -rw-r--r-- | media-libs/mlt++/files/mlt++-20060601-as-needed.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/media-libs/mlt++/files/mlt++-20060601-as-needed.patch b/media-libs/mlt++/files/mlt++-20060601-as-needed.patch new file mode 100644 index 000000000000..2480956745f0 --- /dev/null +++ b/media-libs/mlt++/files/mlt++-20060601-as-needed.patch @@ -0,0 +1,51 @@ +--- mlt++-20060601/configure.old 2006-11-11 17:16:13.000000000 +0100 ++++ mlt++-20060601/configure 2006-11-11 17:16:30.000000000 +0100 +@@ -37,13 +37,13 @@ + echo LIBSUF=.dylib + echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC `mlt-config --cflags`" + echo "LIBFLAGS=-dynamiclib -single_module" +- echo "LDFLAGS+=`mlt-config --libs` `mlt-config miracle --libs` `mlt-config valerie --libs`" ++ echo "OURLDFLAGS=`mlt-config --libs` `mlt-config miracle --libs` `mlt-config valerie --libs`" + ;; + Linux) + echo LIBSUF=.so + echo "CXXFLAGS+=-pthread -Wall -fPIC `mlt-config --cflags`" + echo "LIBFLAGS=-shared" +- echo "LDFLAGS+=`mlt-config --libs` `mlt-config miracle --libs`" ++ echo "OURLDFLAGS=`mlt-config --libs` `mlt-config miracle --libs`" + ;; + esac >> config.mak + +--- mlt++-20060601/src/Makefile.old 2006-11-11 17:22:39.000000000 +0100 ++++ mlt++-20060601/src/Makefile 2006-11-11 17:23:10.000000000 +0100 +@@ -39,7 +39,7 @@ + all: $(TARGET) + + $(TARGET): $(OBJS) +- $(CXX) $(LIBFLAGS) -o $@ $(OBJS) $(LDFLAGS) ++ $(CXX) $(LIBFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(OURLDFLAGS) + ln -sf $(TARGET) $(NAME) + + clean: +--- mlt++-20060601/test/Makefile.old 2006-11-11 17:24:47.000000000 +0100 ++++ mlt++-20060601/test/Makefile 2006-11-11 17:25:30.000000000 +0100 +@@ -1,16 +1,18 @@ + include ../config.mak + + CXXFLAGS+=-Wall -g `mlt-config --cflags` -I ../src +-LDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `mlt-config --libs` ++OURLDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `mlt-config --libs` + CC=c++ + + all: play server + + play: play.o ++ $(CC) $(LDFLAGS) -o $@ play.o $(OURLDFLAGS) + + play.o: play.cpp + + server: server.o ++ $(CC) $(LDFLAGS) -o $@ server.o $(OURLDFLAGS) + + server.o: server.cpp + |