summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-08-21 12:25:57 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-08-21 12:25:57 +0000
commit3112014ceea71f7796fc0f65e601aaeaac844e66 (patch)
tree4f532cba48fb1770a52368356a7ed2ebe477f255 /sci-libs
parentsys-kernel/dracut: Version bump to 013 and EAPI bump to 4. (diff)
downloadgentoo-2-3112014ceea71f7796fc0f65e601aaeaac844e66.tar.gz
gentoo-2-3112014ceea71f7796fc0f65e601aaeaac844e66.tar.bz2
gentoo-2-3112014ceea71f7796fc0f65e601aaeaac844e66.zip
Fix underlinking, bug 371883
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/opencascade/ChangeLog6
-rw-r--r--sci-libs/opencascade/files/opencascade-6.3-underlinking.patch9
-rw-r--r--sci-libs/opencascade/opencascade-6.3-r3.ebuild3
3 files changed, 16 insertions, 2 deletions
diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index 0bd074a8e074..45fefef92b86 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/opencascade
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.2 2011/03/07 22:51:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.3 2011/08/21 12:25:57 dilfridge Exp $
+
+ 21 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ opencascade-6.3-r3.ebuild, +files/opencascade-6.3-underlinking.patch:
+ Fix underlinking, bug 371883
07 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
opencascade-6.3-r3.ebuild:
diff --git a/sci-libs/opencascade/files/opencascade-6.3-underlinking.patch b/sci-libs/opencascade/files/opencascade-6.3-underlinking.patch
new file mode 100644
index 000000000000..7b550f514587
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.3-underlinking.patch
@@ -0,0 +1,9 @@
+diff -ruN OpenCASCADE6.3.0.orig/ros/adm/make/DRAWEXE/Makefile.am OpenCASCADE6.3.0/ros/adm/make/DRAWEXE/Makefile.am
+--- OpenCASCADE6.3.0.orig/ros/adm/make/DRAWEXE/Makefile.am 2008-09-09 17:46:05.000000000 +0200
++++ OpenCASCADE6.3.0/ros/adm/make/DRAWEXE/Makefile.am 2011-08-21 12:40:22.000000000 +0200
+@@ -22,4 +22,5 @@
+ ../TKMath/libTKMath.la \
+ ../TKG3d/libTKG3d.la \
+ ../TKernel/libTKernel.la \
++ $(X_LIBS) -ldl \
+ $(STLPort_LIB) $(CSF_TclLibs_LIB) $(CSF_TclTkLibs_LIB) $(CSF_gdi32_LIB) $(CSF_advapi32_LIB) $(CSF_user32_LIB) $(CSF_SOCKETLibs_LIB) $(CSF_FPELibs_LIB) $(CSF_ThreadLibs_LIB) $(CSF_kernel32_LIB)
diff --git a/sci-libs/opencascade/opencascade-6.3-r3.ebuild b/sci-libs/opencascade/opencascade-6.3-r3.ebuild
index 6814d300b968..ac705db47bcc 100644
--- a/sci-libs/opencascade/opencascade-6.3-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-6.3-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.3-r3.ebuild,v 1.2 2011/03/07 22:51:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.3-r3.ebuild,v 1.3 2011/08/21 12:25:57 dilfridge Exp $
EAPI=3
@@ -78,6 +78,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-fixed-DESTDIR.patch
epatch "${FILESDIR}"/${P}-missing-mode.patch
+ epatch "${FILESDIR}"/${P}-underlinking.patch
source env.ksh
eautoreconf