summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-01-19 13:25:59 +0000
committerJustin Lecher <jlec@gentoo.org>2011-01-19 13:25:59 +0000
commit8ad454a222622769cf61c9ed6c04b92afb865879 (patch)
tree5bafeefae16bc64b8b6dce90ce05f6814b5e33db /x11-libs/libxdl_view
parentTrim down 1.6.2 branch by culling vulnerable ebuild for security bug #352059.... (diff)
downloadgentoo-2-8ad454a222622769cf61c9ed6c04b92afb865879.tar.gz
gentoo-2-8ad454a222622769cf61c9ed6c04b92afb865879.tar.bz2
gentoo-2-8ad454a222622769cf61c9ed6c04b92afb865879.zip
Parallel compilation fix, 352119
(Portage version: 2.2.0_alpha17/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/libxdl_view')
-rw-r--r--x11-libs/libxdl_view/ChangeLog6
-rw-r--r--x11-libs/libxdl_view/files/4.2-as-needed.patch7
-rw-r--r--x11-libs/libxdl_view/files/4.2-impl-dec.patch2
3 files changed, 10 insertions, 5 deletions
diff --git a/x11-libs/libxdl_view/ChangeLog b/x11-libs/libxdl_view/ChangeLog
index eff5ce2df1c0..90bf6725d2be 100644
--- a/x11-libs/libxdl_view/ChangeLog
+++ b/x11-libs/libxdl_view/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/libxdl_view
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxdl_view/ChangeLog,v 1.4 2011/01/16 10:51:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxdl_view/ChangeLog,v 1.5 2011/01/19 13:25:59 jlec Exp $
+
+ 19 Jan 2011; Justin Lecher <jlec@gentoo.org> files/4.2-as-needed.patch,
+ files/4.2-impl-dec.patch:
+ Parallel compilation fix, 352119
16 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
libxdl_view-4.2-r1.ebuild:
diff --git a/x11-libs/libxdl_view/files/4.2-as-needed.patch b/x11-libs/libxdl_view/files/4.2-as-needed.patch
index e45a43c85ba2..6f06d73f9a86 100644
--- a/x11-libs/libxdl_view/files/4.2-as-needed.patch
+++ b/x11-libs/libxdl_view/files/4.2-as-needed.patch
@@ -1,15 +1,16 @@
diff --git a/Makefile.am b/Makefile.am
-index 347bb21..aa41ba3 100644
+index 347bb21..cbb04db 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -19,7 +21,10 @@ lib_LTLIBRARIES = libxdl_view.la libxdl_viewextra.la
+@@ -19,7 +19,11 @@ lib_LTLIBRARIES = libxdl_view.la libxdl_viewextra.la
## The initial value of this was a mistake!
## See the libtool doc.
libxdl_view_la_LDFLAGS = -version-info 2:0:0
+libxdl_view_la_LIBADD = -lX11 -lXt -lm
+
libxdl_viewextra_la_LDFLAGS = -version-info 0:0:0
-+libxdl_viewextra_la_LIBADD = -lm -L$(srcdir)/.libs -lxdl_view
++libxdl_viewextra_la_DEPENDENCIES = libxdl_view.la
++libxdl_viewextra_la_LIBADD = -lm -lxdl_view
EXTRA_DIST = doc/xdl_view_icon.gif doc/xdl_view_top.gif \
doc/xdl_view_top.html doc/xdl_view_updates.html \
diff --git a/x11-libs/libxdl_view/files/4.2-impl-dec.patch b/x11-libs/libxdl_view/files/4.2-impl-dec.patch
index 2880719083d7..418143777338 100644
--- a/x11-libs/libxdl_view/files/4.2-impl-dec.patch
+++ b/x11-libs/libxdl_view/files/4.2-impl-dec.patch
@@ -6,7 +6,7 @@ index 347bb21..aa41ba3 100644
## Process this file with automake.
-+CFLAGS += -std=c99
++CFLAGS += -std=c99 -L.libs
+
libxdl_view_la_SOURCES = xdl_base_fr.c xdl_blank_obj.c xdl_image.c \
xdl_bg.c xdl_img_rd.c xdl_film_img.c xdl_io_window.c \