diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 21:34:00 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 21:34:00 +0200 |
| commit | c0c1a90179dd0f0e19549f279ee95cae7e577b82 (patch) | |
| tree | 6ebeea5d799486d1c11361118b2878452f509cee /redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch | |
| parent | 75c1b2f8bf7066e1b55c3168a78317373a56e711 (diff) | |
| download | tde-packaging-c0c1a90179dd0f0e19549f279ee95cae7e577b82.tar.gz tde-packaging-c0c1a90179dd0f0e19549f279ee95cae7e577b82.zip | |
RHEL/Fedora: some more updates for MGA2/MDV2011 building
Diffstat (limited to 'redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch')
| -rw-r--r-- | redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch b/redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch new file mode 100644 index 000000000..bedb9f820 --- /dev/null +++ b/redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch @@ -0,0 +1,31 @@ +--- bibletime/sword.m4.ftbfs 2011-05-17 20:42:02.000000000 +0200 ++++ bibletime/sword.m4 2012-08-03 17:40:00.461746639 +0200 +@@ -119,7 +119,7 @@ + EOF + + +-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + if AC_TRY_EVAL(ac_link) && test -s conftest; then + if test -x conftest; then + eval ac_cv_installed_sword_version=`./conftest 2>&5` +@@ -192,7 +192,7 @@ + } + EOF + +-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + if AC_TRY_EVAL(ac_link) && test -s conftest; then + if test -x conftest; then + eval ac_cv_sword_recent_version=`./conftest $1 2>&5` +--- bibletime/clucene.m4.ORI 2012-08-03 17:41:19.989067063 +0200 ++++ bibletime/clucene.m4 2012-08-03 17:41:35.675734952 +0200 +@@ -119,7 +119,7 @@ + EOF + + +-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + if AC_TRY_EVAL(ac_link) && test -s conftest; then + if test -x conftest; then + eval ac_cv_installed_clucene_version=`./conftest 2>&5` |