diff options
| author |   Keri Harris <keri@gentoo.org> | 2007-01-29 08:04:45 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2007-01-29 08:04:45 +0000 |
| commit | 78db674d1647ab71a14095cd1304f2354ab8b43a (patch) | |
| tree | 95950e5a9ba0febbd1e2071b7ead426e84cb2912 /dev-lang/xsb | |
| parent | version bump as per bug #156083 (diff) | |
| download | gentoo-2-78db674d1647ab71a14095cd1304f2354ab8b43a.tar.gz gentoo-2-78db674d1647ab71a14095cd1304f2354ab8b43a.tar.bz2 gentoo-2-78db674d1647ab71a14095cd1304f2354ab8b43a.zip | |
Fix .so dependencies in ODBC and MySQL drivers.
(Portage version: 2.1.2-r4)
Diffstat (limited to 'dev-lang/xsb')
| -rw-r--r-- | dev-lang/xsb/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/xsb/files/xsb-3.0.1-mysql.patch | 2 | ||||
| -rw-r--r-- | dev-lang/xsb/files/xsb-3.0.1-odbc.patch | 2 | ||||
| -rw-r--r-- | dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch | 11 |
4 files changed, 16 insertions, 5 deletions
diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog index a5d138a97947..d7fb42236a56 100644 --- a/dev-lang/xsb/ChangeLog +++ b/dev-lang/xsb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/xsb # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.2 2007/01/29 06:45:05 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.3 2007/01/29 08:04:45 keri Exp $ + + 29 Jan 2007; keri <keri@gentoo.org> files/xsb-3.0.1-mysql.patch, + files/xsb-3.0.1-odbc.patch, files/xsb-3.0.1-xsb-script.patch: + Fix .so dependencies in ODBC and MySQL drivers. 29 Jan 2007; keri <keri@gentoo.org> files/xsb-3.0.1-configure.patch: Enable use of iODBC driver manager without explicit support for ODBC. diff --git a/dev-lang/xsb/files/xsb-3.0.1-mysql.patch b/dev-lang/xsb/files/xsb-3.0.1-mysql.patch index b7949f740ea0..9b12014b2da6 100644 --- a/dev-lang/xsb/files/xsb-3.0.1-mysql.patch +++ b/dev-lang/xsb/files/xsb-3.0.1-mysql.patch @@ -84,7 +84,7 @@ diff -ur XSB.orig/packages/dbdrivers/mysql/mysql_driver_config.P XSB/packages/db runtime_loader_flag(XCC, MysqlLibdir, MysqlRunpathFlag), fmt_write_string(LD_flags, - ' %s %s -lmysqlclient -ldl %s%sdriver_manager.so %s%smysql_driver.so', f(MysqlRunpathFlag, MysqlLibdir_flag, ConfigLibdir, Slash, ConfigLibdir, Slash)), -+ ' %s %s -lmysqlclient -ldl ./driver_manager.so', f(MysqlRunpathFlag, MysqlLibdir_flag)), ++ ' %s %s -lmysqlclient -ldl driver_manager.so', f(MysqlRunpathFlag, MysqlLibdir_flag)), package_configuration(dir(mysql_driver), MySQLDriverDir), fmt_write_string(LD_directives_file, '%s%scc%smysql_driver.H', f(MySQLDriverDir, Slash, Slash)), diff --git a/dev-lang/xsb/files/xsb-3.0.1-odbc.patch b/dev-lang/xsb/files/xsb-3.0.1-odbc.patch index bc3b6207d3f8..c091e0013298 100644 --- a/dev-lang/xsb/files/xsb-3.0.1-odbc.patch +++ b/dev-lang/xsb/files/xsb-3.0.1-odbc.patch @@ -74,7 +74,7 @@ diff -ur XSB.orig/packages/dbdrivers/odbc/odbc_driver_config.P XSB/packages/dbdr - ' %s %s %s%sdriver_manager.so %s%sodbc_driver.so -lodbc -ldl', - f(OdbcRunpathFlag, ODBC_libdir_flag, - ConfigLibDir, Slash, ConfigLibDir, Slash)) -+ ' %s %s ./driver_manager.so -lodbc -ldl', ++ ' %s %s driver_manager.so -lodbc -ldl', + f(OdbcRunpathFlag, ODBC_libdir_flag)) ), package_configuration(dir(odbc_driver), ODBCDriverDir), diff --git a/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch b/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch index 7bffa83f40e8..bf9a3250e661 100644 --- a/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch +++ b/dev-lang/xsb/files/xsb-3.0.1-xsb-script.patch @@ -1,5 +1,5 @@ --- XSB.orig/build/xsb.in 2005-01-15 07:30:43.000000000 +1300 -+++ XSB/build/xsb.in 2007-01-28 22:08:36.000000000 +1300 ++++ XSB/build/xsb.in 2007-01-29 20:53:13.000000000 +1300 @@ -72,9 +72,9 @@ scriptdir=`dirname $thisfile` topdir=`dirname $scriptdir` @@ -13,7 +13,14 @@ executable=${exec_dir}/bin/xsb # The purpose of this complex thing is to make sure that arguments -@@ -101,12 +101,12 @@ +@@ -95,18 +95,18 @@ + fi + + if test -x "$executable" ; then +- eval "exec @CROSS_SIMULATOR@ $executable $xsb_cmd" ++ LD_LIBRARY_PATH=${exec_dir}/lib eval "exec @CROSS_SIMULATOR@ $executable $xsb_cmd" + else + echo "${executable}: " echo " file doesn't exist or is not executable" echo "" echo "XSB might not have have been compiled for the following machine configuration:" |