diff options
author | Cyprien Nicolas (fulax) <gentoo@fulax.fr> | 2019-06-15 12:46:59 +0200 |
---|---|---|
committer | Cyprien Nicolas (fulax) <gentoo@fulax.fr> | 2019-06-15 12:46:59 +0200 |
commit | 7631303ac7e17863314394f566559706db415e4c (patch) | |
tree | 8c4dbd5ec41ff1eccb9e4c288f647f419bc58f3e | |
parent | dev-lisp/flexi-streams: Drop old version 1.0.16 (diff) | |
download | lisp-7631303ac7e17863314394f566559706db415e4c.tar.gz lisp-7631303ac7e17863314394f566559706db415e4c.tar.bz2 lisp-7631303ac7e17863314394f566559706db415e4c.zip |
dev-lisp/clisp: Drop 2.49.92 (stable in tree); Add -9999
Package-Manager: Portage-2.3.66, Repoman-2.3.11
-rw-r--r-- | dev-lisp/clisp/Manifest | 5 | ||||
-rw-r--r-- | dev-lisp/clisp/clisp-9999.ebuild (renamed from dev-lisp/clisp/clisp-2.49.92.ebuild) | 10 | ||||
-rw-r--r-- | dev-lisp/clisp/files/clisp-2.49.92-after_glibc_cfree_bdb.patch | 185 | ||||
-rw-r--r-- | dev-lisp/clisp/files/clisp-9999-after_glibc_cfree_bdb.patch | 18 |
4 files changed, 26 insertions, 192 deletions
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest index da2f8a52..41ad174e 100644 --- a/dev-lisp/clisp/Manifest +++ b/dev-lisp/clisp/Manifest @@ -1,4 +1,3 @@ -AUX clisp-2.49.92-after_glibc_cfree_bdb.patch 8499 BLAKE2B d093b76cdf25b0822aaca87bd6055c6b58edc68e387d78d7fd979171d881fe585b674246b3a2a6f37a8412b5aef1b997210b4019a1595a07b64471cb9324656f SHA512 1b8cb29bf9caa30ca05474a67202f72f013e57d6b0d2dff1fb5ab0472df9f5c5a5b5de46922c931fa9a4d4a0a25890a05e1f7d38ddfb56c967026eef80001919 -DIST clisp-2.49.92.tar.bz2 9055207 BLAKE2B 6cf331eb9f99f62579e35469e2d01cae066083592ccc71cf483b70b4d1be349cdee9d403e0a7ed1ad1c8c5d805c1dab51c1a5031d77469ff8c4dc52eb58913df SHA512 cc9412a7b3f21c85b040bf5e660380fafb3c2374765a1c00272feb3f7838f2161e27a5d6295cef9976f0c4522f10796cf5ee5447716090d1cc69ecfe598ef306 -EBUILD clisp-2.49.92.ebuild 4026 BLAKE2B 07a221bebc8ff592e7c0f22eb5e02f23a65a6eb966fd67c0750f55ddf1241a946fe1bae5cc50e4fbadf5ed9240701398494f9479ac660e57b34b4c76d8240168 SHA512 9b3144f9264c50b638e4c5d2b448430297eaab2f1609d476de4ca0b0402c31ec09b7161111df31f0cec4be83d16ebf040b853ed1cd2d2c0afdf46864924a0052 +AUX clisp-9999-after_glibc_cfree_bdb.patch 864 BLAKE2B bddd33098e3f9b4847b0981b053dee112dbee03d22a495c6dac4281513118901e24e439c1034974bb1e5370ad8f096b7be6e8ffed98fa8a015a0208d7570b1d4 SHA512 87c1bc74820f2c45a3cc2733f280b7bcc32b69d0f7b72ab703f4d4e8203248ffbcc250632ab40850d849ef894e25ab6e0691558c998782b82e824d13293b8cc5 +EBUILD clisp-9999.ebuild 4100 BLAKE2B 188835d1b5464d51a1d4b4577370406206ee264e43fa3e7e0bbf28c2f1d5a91b5565f9a4ae57708cf3d4d5755956ff047f62605a300f805f36cc868ec50476d4 SHA512 47c08854cbf10eed3cab0f53e3fbccec2b31757e896fce7fdda84796695d324e3aef5441cedbe62db43e12e101811d010359731fc483c6b58a3b9b6985f39a3e MISC metadata.xml 1240 BLAKE2B f64eb9d2b7885fb771d0bd455c3551191ef85c17ef036686ae213058fa9ae3f87f8dab5dab7d6c89c66dbb883c89f0624009ced645a05f40463f22560802c581 SHA512 8b40fdaba20939478eb982350eed9480df6ac8a48885ceb4e04da9d4bfd77e3c8451f96d2745ce4baff5d4e16db5363d81a66c50a364046f921a47478d563b49 diff --git a/dev-lisp/clisp/clisp-2.49.92.ebuild b/dev-lisp/clisp/clisp-9999.ebuild index 83c982ee..3904c794 100644 --- a/dev-lisp/clisp/clisp-2.49.92.ebuild +++ b/dev-lisp/clisp/clisp-9999.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit eutils flag-o-matic multilib toolchain-funcs xdg-utils +inherit git-r3 DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp" -HOMEPAGE="http://clisp.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" +HOMEPAGE="http://clisp.sourceforge.net/ https://gitlab.com/gnu-clisp/clisp" +#SRC_URI="mirror://gentoo/${P}.tar.bz2" +EGIT_REPO_URI="https://gitlab.com/gnu-clisp/clisp.git" LICENSE="GPL-2" SLOT="2/8" -KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86" +KEYWORDS="" IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm -threads +unicode +zlib" # "jit" disabled ATM diff --git a/dev-lisp/clisp/files/clisp-2.49.92-after_glibc_cfree_bdb.patch b/dev-lisp/clisp/files/clisp-2.49.92-after_glibc_cfree_bdb.patch deleted file mode 100644 index ae83bbb8..00000000 --- a/dev-lisp/clisp/files/clisp-2.49.92-after_glibc_cfree_bdb.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff -r -U3 clisp-2.49.90.orig/modules/berkeley-db/bdb.c clisp-2.49.90/modules/berkeley-db/bdb.c ---- clisp-2.49.90.orig/modules/berkeley-db/bdb.c 2018-01-27 12:03:01.000000000 +0100 -+++ clisp-2.49.90/modules/berkeley-db/bdb.c 2018-02-12 20:37:24.203803219 +0100 -@@ -2216,7 +2216,13 @@ - c_data.compact_timeout = timeout; - c_data.compact_pages = pages; - SYSCALL(db->compact,(db,txn,pstart,pstop,&c_data,flags,&end)); -- pushSTACK(uint32_to_I(c_data.compact_empty_buckets)); -+ /* ==== -+ * compact_empty_buckets is in bdb-5.3 as part of output stats -+ * however this version use bdb-4.8 which does not have it -+ * ==== -+ * -+ * pushSTACK(uint32_to_I(c_data.compact_empty_buckets)); -+ * */ - pushSTACK(uint32_to_I(c_data.compact_pages_free)); - pushSTACK(uint32_to_I(c_data.compact_pages_examine)); - pushSTACK(uint32_to_I(c_data.compact_levels)); -diff -r -U3 clisp-2.49.90.orig/modules/bindings/glibc/linux.lisp clisp-2.49.90/modules/bindings/glibc/linux.lisp ---- clisp-2.49.90.orig/modules/bindings/glibc/linux.lisp 2018-01-10 00:32:25.000000000 +0100 -+++ clisp-2.49.90/modules/bindings/glibc/linux.lisp 2018-02-12 20:48:22.467775536 +0100 -@@ -1,7 +1,7 @@ - ;; Foreign functions provided by the Linux C library version 6, - ;; i.e. the GNU C library version 2.0.7. - ;; Bruno Haible 10.4.1998, 19.4.1998 --;; Sam Steingold 2002-2008, 2011 -+;; Sam Steingold 2002-2008, 2011, 2013, 2016-2017 - - ;; NB: quite a few functions here have more portable counterparts in POSIX - -@@ -686,9 +686,8 @@ - (def-call-out system? (:arguments (null c-string)) - (:return-type boolean) (:name "system")) - --; You can uncomment this if your compiler sets __USE_GNU --; (def-call-out canonicalize_file_name (:arguments (name c-string)) --; (:return-type c-string :malloc-free)) -+(def-call-out canonicalize_file_name (:arguments (name c-string)) -+ (:return-type c-string :malloc-free)) - - (def-call-out realpath - (:arguments (name c-string) -@@ -1040,9 +1039,8 @@ - (def-call-out access (:arguments (name c-string) (type int)) - (:return-type int)) - --; You can uncomment this if your compiler sets __USE_GNU --; (def-call-out euidaccess (:arguments (name c-string) (type int)) --; (:return-type int)) -+(def-call-out euidaccess (:arguments (name c-string) (type int)) -+ (:return-type int)) - - (defconstant SEEK_SET 0) - (defconstant SEEK_CUR 1) -@@ -1093,9 +1091,8 @@ - ;(def-call-out getcwd (:arguments (buf c-string :out) (size size_t)) ; ?? - ; (:return-type c-string)) - --; You can uncomment this if your compiler sets __USE_GNU --; (def-call-out get_current_dir_name (:arguments) --; (:return-type c-string :malloc-free)) -+(def-call-out get_current_dir_name (:arguments) -+ (:return-type c-string :malloc-free)) - - ;(def-call-out getwd (:arguments (buf c-string :out)) ; ?? - ; (:return-type c-string)) -@@ -1323,8 +1320,7 @@ - ; (:arguments (size int) (list (c-ptr (c-array gid_t ??)) :out)) ; ?? - ; (:return-type int)) - --; You can uncomment this if your compiler sets __USE_GNU --; (def-call-out group_member (:arguments (gid gid_t)) (:return-type boolean)) -+(def-call-out group_member (:arguments (gid gid_t)) (:return-type boolean)) - (def-call-out setuid (:arguments (uid uid_t)) (:return-type int)) - (def-call-out setreuid (:arguments (ruid uid_t) (euid uid_t)) - (:return-type int)) -@@ -1821,8 +1817,7 @@ - (:return-type c-string :malloc-free)) - (def-call-out ungetc (:arguments (c int) (fp FILE)) - (:return-type int)) --; You can uncomment this if your compiler sets __USE_GNU --; (def-call-out fcloseall (:arguments) (:return-type int)) -+(def-call-out fcloseall (:arguments) (:return-type int)) - (def-call-out fdopen (:arguments (fildes int) (mode c-string)) - (:return-type c-pointer)) - (def-call-out fileno (:arguments (fp FILE)) (:return-type int)) -@@ -1900,11 +1895,11 @@ - (:return-type (c-ptr-null dirent))) - (def-call-out readdir64 (:arguments (dirp c-pointer)) - (:return-type (c-ptr-null dirent64))) --(def-call-out readdir_r -+(def-call-out readdir_r ; deprecated - (:arguments (dirp c-pointer) (entry (c-ptr dirent) :out :alloca) - (result (c-ptr (c-ptr dirent)) :out :alloca)) ; ?? - (:return-type int)) --(def-call-out readdir64_r -+(def-call-out readdir64_r ; deprecated - (:arguments (dirp c-pointer) (entry (c-ptr dirent64) :out :alloca) - (result (c-ptr (c-ptr dirent64)) :out :alloca)) ; ?? - (:return-type int)) -diff -r -U3 clisp-2.49.90.orig/modules/bindings/glibc/test.tst clisp-2.49.90/modules/bindings/glibc/test.tst ---- clisp-2.49.90.orig/modules/bindings/glibc/test.tst 2018-01-10 00:04:26.000000000 +0100 -+++ clisp-2.49.90/modules/bindings/glibc/test.tst 2018-02-12 20:50:48.225769407 +0100 -@@ -14,6 +14,16 @@ - (= linux:DT_DIR (linux:dirent64-d_type (show (linux:readdir64 *d*)))) T - (linux:closedir *d*) 0 - -+(stringp (show (linux:get-domain-name))) T -+(stringp (show (linux:get-host-name))) T -+ -+;; usually __USE_GNU is defined, so this should work: -+(let* ((d (linux:get_current_dir_name)) -+ (c (linux:canonicalize_file_name (concatenate 'string d "/.")))) -+ (or (string= d c) -+ (list :cur-dir d :canonical c))) -+T -+ - (defparameter *d* (show (linux:opendir "."))) *D* - (linux:dirent-d_name (show (linux:readdir *d*))) "." - (linux:dirent-d_name (show (linux:readdir *d*))) ".." -diff -r -U3 clisp-2.49.90.orig/src/foreign1.lisp clisp-2.49.90/src/foreign1.lisp ---- clisp-2.49.90.orig/src/foreign1.lisp 2018-01-10 00:04:26.000000000 +0100 -+++ clisp-2.49.90/src/foreign1.lisp 2018-02-12 21:03:56.768736245 +0100 -@@ -805,14 +805,17 @@ - c-name (to-c-string c-name) (third variable) (first variable)) - (when *foreign-guard* (format *coutput-stream* "# endif~%")))) - (dolist (function *function-list*) -- (let ((c-name (first function))) -- (when *foreign-guard* -- (format *coutput-stream* "# if defined(HAVE_~A)~%" -- (string-upcase c-name))) -+ (let ((c-name (first function)) -+ (guard (fourth function))) -+ (when guard -+ (format *coutput-stream* "# if ~A~%" -+ (if (eq guard t) -+ (format nil "defined(HAVE_~A)" (string-upcase c-name)) -+ guard))) - (format *coutput-stream* - " register_foreign_function((void*)&~A,~A,~D);~%" - c-name (to-c-string c-name) (svref (second function) 3)) -- (when *foreign-guard* (format *coutput-stream* "# endif~%")))) -+ (when guard (format *coutput-stream* "# endif~%")))) - (maphash (lambda (type fun-vec) - (declare (ignore type)) - (let ((c-name (to-c-name (car fun-vec)))) -@@ -1083,7 +1086,7 @@ - (defmacro DEF-CALL-OUT (&whole whole-form name &rest options) - (setq name (check-symbol name (first whole-form))) - (let* ((alist -- (parse-options options '(:name :arguments :return-type :language -+ (parse-options options '(:name :arguments :return-type :language :guard - :built-in :library :version :documentation) - whole-form)) - (def (gensym "DEF-CALL-OUT-")) -@@ -1095,6 +1098,7 @@ - (version (second (assoc :version alist))) - (c-name (foreign-name name (assoc :name alist))) - (built-in (second (assoc :built-in alist))) -+ (guard (get-assoc :guard alist '*foreign-guard*)) - ;; Maximize sharing in .fas file, reuse options - ;; parse-c-function ignores unknown options, e.g. :name - (ctype `(PARSE-C-FUNCTION ',options ',whole-form))) -@@ -1102,7 +1106,7 @@ - ',c-name ,ctype ',properties ,library ,version NIL))) - (EXT:COMPILER-LET ((,def ,ctype)) - (EVAL-WHEN (COMPILE) -- (UNLESS ,LIBRARY (NOTE-C-FUN ',c-name ,def ',built-in))) -+ (UNLESS ,LIBRARY (NOTE-C-FUN ',c-name ,def ',built-in ,guard))) - (SYSTEM::EVAL-WHEN-COMPILE - (SYSTEM::C-DEFUN ',name (C-TYPE-TO-SIGNATURE ,ctype)))) - (WHEN ,def ; found library function -@@ -1110,10 +1114,10 @@ - (SYSTEM::%PUTD ',name ,def)) - ',name))) - --(defun note-c-fun (c-name ctype built-in) ; not ABI, compile-time only -+(defun note-c-fun (c-name ctype built-in guard) ; not ABI, compile-time only - (when (system::prepare-coutput-file) - (prepare-module) -- (push (list c-name ctype built-in) -+ (push (list c-name ctype built-in guard) - *function-list*))) - - (defun count-inarguments (arg-vector) diff --git a/dev-lisp/clisp/files/clisp-9999-after_glibc_cfree_bdb.patch b/dev-lisp/clisp/files/clisp-9999-after_glibc_cfree_bdb.patch new file mode 100644 index 00000000..84645d71 --- /dev/null +++ b/dev-lisp/clisp/files/clisp-9999-after_glibc_cfree_bdb.patch @@ -0,0 +1,18 @@ +diff -r -U3 clisp-2.49.90.orig/modules/berkeley-db/bdb.c clisp-2.49.90/modules/berkeley-db/bdb.c +--- clisp-2.49.90.orig/modules/berkeley-db/bdb.c 2018-01-27 12:03:01.000000000 +0100 ++++ clisp-2.49.90/modules/berkeley-db/bdb.c 2018-02-12 20:37:24.203803219 +0100 +@@ -2216,7 +2216,13 @@ + c_data.compact_timeout = timeout; + c_data.compact_pages = pages; + SYSCALL(db->compact,(db,txn,pstart,pstop,&c_data,flags,&end)); +- pushSTACK(uint32_to_I(c_data.compact_empty_buckets)); ++ /* ==== ++ * compact_empty_buckets is in bdb-5.3 as part of output stats ++ * however this version use bdb-4.8 which does not have it ++ * ==== ++ * ++ * pushSTACK(uint32_to_I(c_data.compact_empty_buckets)); ++ * */ + pushSTACK(uint32_to_I(c_data.compact_pages_free)); + pushSTACK(uint32_to_I(c_data.compact_pages_examine)); + pushSTACK(uint32_to_I(c_data.compact_levels)); |