Changeset 13027


Ignore:
Timestamp:
11/19/10 11:24:10 (10 years ago)
Author:
Mark Evenson
Message:

Fix ASDF-INSTALL fails to download (ticket #110).

Use an 8-bit encoding (:iso-8559-1) in the streams for the package
download to prevent attempts to recode if ABCL is running under a
multi-bit encoding locale (i.e. UTF-8).

Ensure that we use 'gtar' under Solaris.

Location:
trunk/abcl/contrib/asdf-install
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/contrib/asdf-install/installer.lisp

    r12878 r13027  
    303303(defun tar-arguments (source packagename)
    304304  #-(or :win32 :mswindows :scl)
    305   (list "-C" (namestring (truename source))
     305  (list "-C"    (namestring (truename source))
    306306  "-xzvf" (namestring (truename packagename)))
    307307  #+(or :win32 :mswindows)
     
    312312    (namestring (truename packagename))))
    313313  #+scl
    314   (list "-C" (ext:unix-namestring (truename source))
     314  (list "-C"    (ext:unix-namestring (truename source))
    315315  "-xzvf" (ext:unix-namestring (truename packagename))))
    316316
     
    334334         ;; Some tar programs (OSX) list entries with preceeding "x "
    335335         ;; as in "x entry/file.asd"
    336          (pos-begin (if (= (search "x " tar) 0)
     336         (pos-begin (if (string= (subseq tar 0 2) "x ")
    337337                        2
    338338                        0))
     
    345345        `(:relative ,(subseq tar pos-begin pos-slash)))
    346346     source)))
    347     ;(princ tar)
    348347    (loop for sysfile in (append
    349348                          (directory
  • trunk/abcl/contrib/asdf-install/port.lisp

    r12487 r13027  
    145145  (let ((socket
    146146         (ext:make-socket (url-host url) (url-port url))))
    147     (ext:get-socket-stream socket)))
     147    (ext:get-socket-stream socket :external-format :iso-8859-1)))
    148148
    149149
     
    322322   '(:external-format :latin1)
    323323   #+:scl
     324   '(:external-format :iso-8859-1)
     325   #+abcl
    324326   '(:external-format :iso-8859-1)
    325327   #+(or :clisp :digitool (and :lispworks :win32))
  • trunk/abcl/contrib/asdf-install/variables.lisp

    r12487 r13027  
    5353
    5454(defvar *gnu-tar-program*
    55   #-(or :netbsd :freebsd :solaris) "tar"
    56   #+(or :netbsd :freebsd :solaris) "gtar"
     55  #-(or :netbsd :freebsd :solaris :sunos) "tar"
     56  #+(or :netbsd :freebsd :solaris :sunos) "gtar"
    5757  "Path to the GNU tar program")
    5858
Note: See TracChangeset for help on using the changeset viewer.