From a601541aa3c4e775d4657da1016d9cf5dc042ca8 Mon Sep 17 00:00:00 2001 From: "Juergen \"George\" Sawinski" Date: Sat, 24 Jul 2004 20:26:35 +0000 Subject: [PATCH] Juergen Sawinski: -make jsaw/sword and jsaw/bibletime compile with gcc 3.4 [2004072002263123543] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3644 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/jsaw/bibletime/bibletime.conf | 4 ++++ package/jsaw/sword/sword.desc | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/jsaw/bibletime/bibletime.conf b/package/jsaw/bibletime/bibletime.conf index 61b7142f9..b44c0d624 100644 --- a/package/jsaw/bibletime/bibletime.conf +++ b/package/jsaw/bibletime/bibletime.conf @@ -26,3 +26,7 @@ var_append confopt ' ' "--with-extra-includes=$root/$prefix/includes" var_append confopt ' ' "--with-extra-libs=$root/$prefix/libs" #@FIXME: documentation (bibletime-doc-1.2.2) + +# this is needed if compiling with gcc-3.4 +var_append CXXFLAGS ' ' "-fpermissive" +export CXXFLAGS CFLAGS diff --git a/package/jsaw/sword/sword.desc b/package/jsaw/sword/sword.desc index 1050e61b9..fb15b34dc 100644 --- a/package/jsaw/sword/sword.desc +++ b/package/jsaw/sword/sword.desc @@ -44,4 +44,3 @@ [P] X -----5---9 221.400 [D] 2319155485 sword-1.5.7.tar.gz http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/ -[O] var_append extraconfopt " " "--without-lucene"