1 |
commit: dfbc1b4b7a8ad01f03defd04329140d5bb1e1a9e |
2 |
Author: maurerpe <junk4me46806 <AT> yahoo <DOT> com> |
3 |
AuthorDate: Thu Jul 6 12:55:30 2017 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 6 12:56:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfbc1b4b |
7 |
|
8 |
media-gfx/opencsg: fix build with GCC 6 |
9 |
|
10 |
Gentoo-bug: 623840 |
11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
12 |
|
13 |
.../opencsg/files/opencsg-1.4.2-includepath.patch | 25 ++++++++++++++++++++++ |
14 |
media-gfx/opencsg/opencsg-1.4.2.ebuild | 10 ++++----- |
15 |
2 files changed, 30 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch b/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..9b66ae44ed0 |
20 |
--- /dev/null |
21 |
+++ b/media-gfx/opencsg/files/opencsg-1.4.2-includepath.patch |
22 |
@@ -0,0 +1,25 @@ |
23 |
+* Fix build with GCC 6 |
24 |
+* Don't hardcode libdir |
25 |
+ |
26 |
+Gentoo-bug: 623840 |
27 |
+ |
28 |
+--- a/src.pro |
29 |
++++ b/src.pro |
30 |
+@@ -7,14 +7,14 @@ |
31 |
+ } |
32 |
+ |
33 |
+ CONFIG += opengl warn_on release |
34 |
+-INCLUDEPATH += ../include ../ $$INSTALLDIR/include |
35 |
++INCLUDEPATH += ../include .. |
36 |
+ CONFIG -= qt |
37 |
+-LIBS += -L$$INSTALLDIR/lib -lGLEW |
38 |
++LIBS += -lGLEW |
39 |
+ |
40 |
+ DESTDIR = ../lib |
41 |
+ headers.files = ../include/opencsg.h |
42 |
+ headers.path = $$INSTALLDIR/include |
43 |
+-target.path = $$INSTALLDIR/lib |
44 |
++target.path = $$INSTALLDIR/$$LIBDIR |
45 |
+ INSTALLS += target headers |
46 |
+ |
47 |
+ HEADERS = ../include/opencsg.h \ |
48 |
|
49 |
diff --git a/media-gfx/opencsg/opencsg-1.4.2.ebuild b/media-gfx/opencsg/opencsg-1.4.2.ebuild |
50 |
index 1c905349bf8..9f02e2a9c1d 100644 |
51 |
--- a/media-gfx/opencsg/opencsg-1.4.2.ebuild |
52 |
+++ b/media-gfx/opencsg/opencsg-1.4.2.ebuild |
53 |
@@ -22,19 +22,19 @@ DEPEND="${RDEPEND} |
54 |
|
55 |
S="${WORKDIR}/${MY_P}/src" |
56 |
|
57 |
+PATCHES=( |
58 |
+ "${FILESDIR}/${P}-includepath.patch" |
59 |
+) |
60 |
+ |
61 |
src_prepare() { |
62 |
default |
63 |
|
64 |
# removes duplicated headers |
65 |
rm -r ../glew || die "failed to remove bundled glew" |
66 |
- |
67 |
- sed -i -e "s:^target.path.*:target.path = \$\$INSTALLDIR/$(get_libdir):" \ |
68 |
- src.pro \ |
69 |
- || die 'failed to fix target.path in src.pro' |
70 |
} |
71 |
|
72 |
src_configure() { |
73 |
- eqmake5 src.pro INSTALLDIR="/usr" |
74 |
+ eqmake5 src.pro INSTALLDIR="/usr" LIBDIR="$(get_libdir)" |
75 |
} |
76 |
|
77 |
src_install() { |