summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Kennedy <mkennedy@gentoo.org>2005-12-31 19:48:15 +0000
committerMatthew Kennedy <mkennedy@gentoo.org>2005-12-31 19:48:15 +0000
commit15e06824de7411d5ecee02b03b913f6c09132824 (patch)
treeb59ab7fe120f85a04bef429cf3d0e7f39ace98ef /dev-lisp
parentstable amd64 (diff)
downloadgentoo-2-15e06824de7411d5ecee02b03b913f6c09132824.tar.gz
gentoo-2-15e06824de7411d5ecee02b03b913f6c09132824.tar.bz2
gentoo-2-15e06824de7411d5ecee02b03b913f6c09132824.zip
Correct error in clsql_mysql.so path.
(Portage version: 2.1_pre2)
Diffstat (limited to 'dev-lisp')
-rw-r--r--dev-lisp/cl-sql/ChangeLog6
-rw-r--r--dev-lisp/cl-sql/Manifest12
-rw-r--r--dev-lisp/cl-sql/files/3.5.2-gentoo.patch10
3 files changed, 12 insertions, 16 deletions
diff --git a/dev-lisp/cl-sql/ChangeLog b/dev-lisp/cl-sql/ChangeLog
index 4a6808e98f77..91464707146b 100644
--- a/dev-lisp/cl-sql/ChangeLog
+++ b/dev-lisp/cl-sql/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lisp/cl-sql
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.23 2005/12/29 23:33:36 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.24 2005/12/31 19:48:15 mkennedy Exp $
+
+ 31 Dec 2005; Matthew Kennedy <mkennedy@gentoo.org>
+ files/3.5.2-gentoo.patch:
+ Correct error in clsql_mysql.so path.
*cl-sql-3.5.2 (29 Dec 2005)
diff --git a/dev-lisp/cl-sql/Manifest b/dev-lisp/cl-sql/Manifest
index 2a725477190b..cef5620330c7 100644
--- a/dev-lisp/cl-sql/Manifest
+++ b/dev-lisp/cl-sql/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 7410b714d622ad890f0c6a40dc402a86 ChangeLog 4342
MD5 7fd94c2ad4c4d306b0983a349aeadd3d cl-sql-3.2.1.ebuild 3432
MD5 e3a1c06893a5c99d5eba302a883b288f cl-sql-3.5.2.ebuild 3623
-MD5 cb900f5b6b8b3eefc4051914f7b893e3 files/3.5.2-gentoo.patch 4948
+MD5 bfcc907523913bfffcd2cf4f0cdb95e1 files/3.5.2-gentoo.patch 4994
MD5 3cba61937a7bfeb858a4f8fcfede7989 files/digest-cl-sql-3.2.1 63
MD5 6b9586a907723dd600daf91000ed6184 files/digest-cl-sql-3.5.2 63
MD5 25a7993f47b4e9b1261a9956a8d61d90 metadata.xml 431
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDtHJdyiNZaEAZA+ARAvPxAJ9foRlHPE3Tg5iyKk10hYQMLwI/CACdFT9M
-wKi+xQmJtmGSEMCm0Bm29VI=
-=zRyD
------END PGP SIGNATURE-----
diff --git a/dev-lisp/cl-sql/files/3.5.2-gentoo.patch b/dev-lisp/cl-sql/files/3.5.2-gentoo.patch
index 89294125bfb5..585b0aadfb5c 100644
--- a/dev-lisp/cl-sql/files/3.5.2-gentoo.patch
+++ b/dev-lisp/cl-sql/files/3.5.2-gentoo.patch
@@ -1,6 +1,6 @@
diff -ur clsql-3.5.2.orig/db-mysql/mysql-loader.lisp clsql-3.5.2/db-mysql/mysql-loader.lisp
--- clsql-3.5.2.orig/db-mysql/mysql-loader.lisp 2005-07-05 19:51:52.000000000 -0500
-+++ clsql-3.5.2/db-mysql/mysql-loader.lisp 2005-12-29 16:34:32.000000000 -0600
++++ clsql-3.5.2/db-mysql/mysql-loader.lisp 2005-12-31 13:29:19.000000000 -0600
@@ -18,17 +18,6 @@
(in-package #:mysql)
@@ -19,7 +19,7 @@ diff -ur clsql-3.5.2.orig/db-mysql/mysql-loader.lisp clsql-3.5.2/db-mysql/mysql-
(defvar *mysql-supporting-libraries* '("c")
"Used only by CMU. List of library flags needed to be passed to ld to
load the MySQL client library succesfully. If this differs at your site,
-@@ -41,12 +30,16 @@
+@@ -41,14 +30,17 @@
*mysql-library-loaded*)
(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
@@ -35,16 +35,18 @@ diff -ur clsql-3.5.2.orig/db-mysql/mysql-loader.lisp clsql-3.5.2/db-mysql/mysql-
+ :module "mysql"
+ :supporting-libraries *mysql-supporting-libraries*)
+ (uffi:load-foreign-library (make-pathname :directory '(:absolute "usr" "@LIBDIR@" "clsql")
-+ :name "clsql_mysql.so"
++ :name "clsql_mysql"
+ :type "so")
+ :module "clsql-mysql"
+ :supporting-libraries *mysql-supporting-libraries*)
(setq *mysql-library-loaded* t))
+ (clsql-sys:database-type-load-foreign :mysql)
+-
diff -ur clsql-3.5.2.orig/uffi/clsql-uffi-loader.lisp clsql-3.5.2/uffi/clsql-uffi-loader.lisp
--- clsql-3.5.2.orig/uffi/clsql-uffi-loader.lisp 2005-08-22 15:24:22.000000000 -0500
-+++ clsql-3.5.2/uffi/clsql-uffi-loader.lisp 2005-12-29 16:22:44.000000000 -0600
++++ clsql-3.5.2/uffi/clsql-uffi-loader.lisp 2005-12-31 13:28:56.000000000 -0600
@@ -18,37 +18,6 @@
(in-package #:clsql-uffi)