summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-02-05 23:47:39 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-02-05 23:47:39 +0000
commit387fc276234c30f4188b120828308cc405cd39ee (patch)
tree5534e88f0886e353b09663f370f0d3359b3805da /media-video/mjpegtools/files
parentDrop keywords on the (package.masked) 2.0.7 to ~amd64 ~x86 because of setupto... (diff)
downloadhistorical-387fc276234c30f4188b120828308cc405cd39ee.tar.gz
historical-387fc276234c30f4188b120828308cc405cd39ee.tar.bz2
historical-387fc276234c30f4188b120828308cc405cd39ee.zip
Fix parallel make issues, bug #121622.
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'media-video/mjpegtools/files')
-rw-r--r--media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch
new file mode 100644
index 000000000000..b21995e3cbb8
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch
@@ -0,0 +1,60 @@
+Index: mjpegtools-1.8.0/mpeg2enc/Makefile.am
+===================================================================
+--- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.am
++++ mjpegtools-1.8.0/mpeg2enc/Makefile.am
+@@ -110,7 +110,7 @@ libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTIL
+
+ mpeg2enc_DEPENDENCIES = \
+ $(LIBMJPEGUTILS) \
+- $(top_builddir)/mpeg2enc/libmpeg2encpp.la
++ libmpeg2encpp.la
+
+ mpeg2enc_LDADD = \
+ $(top_builddir)/mpeg2enc/libmpeg2encpp.la \
+Index: mjpegtools-1.8.0/mpeg2enc/Makefile.in
+===================================================================
+--- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.in
++++ mjpegtools-1.8.0/mpeg2enc/Makefile.in
+@@ -374,7 +374,7 @@ libmpeg2encpp_la_DEPENDENCIES = $(LIBMJP
+ libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS)
+ mpeg2enc_DEPENDENCIES = \
+ $(LIBMJPEGUTILS) \
+- $(top_builddir)/mpeg2enc/libmpeg2encpp.la
++ libmpeg2encpp.la
+
+ mpeg2enc_LDADD = \
+ $(top_builddir)/mpeg2enc/libmpeg2encpp.la \
+Index: mjpegtools-1.8.0/mplex/Makefile.am
+===================================================================
+--- mjpegtools-1.8.0.orig/mplex/Makefile.am
++++ mjpegtools-1.8.0/mplex/Makefile.am
+@@ -79,5 +79,5 @@ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
+ mplex_SOURCES = main.cpp
+
+ mplex_LDADD = \
+- $(top_builddir)/mplex/libmplex2.la \
++ libmplex2.la \
+ @LIBGETOPT_LIB@ $(LIBM_LIBS)
+Index: mjpegtools-1.8.0/mplex/Makefile.in
+===================================================================
+--- mjpegtools-1.8.0.orig/mplex/Makefile.in
++++ mjpegtools-1.8.0/mplex/Makefile.in
+@@ -95,8 +95,7 @@ PROGRAMS = $(bin_PROGRAMS)
+ am_mplex_OBJECTS = main.$(OBJEXT)
+ mplex_OBJECTS = $(am_mplex_OBJECTS)
+ am__DEPENDENCIES_2 =
+-mplex_DEPENDENCIES = $(top_builddir)/mplex/libmplex2.la \
+- $(am__DEPENDENCIES_2)
++mplex_DEPENDENCIES = libmplex2.la $(am__DEPENDENCIES_2)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -340,7 +339,7 @@ libmplex2_la_LIBADD = $(top_builddir)/ut
+ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
+ mplex_SOURCES = main.cpp
+ mplex_LDADD = \
+- $(top_builddir)/mplex/libmplex2.la \
++ libmplex2.la \
+ @LIBGETOPT_LIB@ $(LIBM_LIBS)
+
+ all: all-am