Jon Boone pushed to branch master at cmucl / cmucl

Commits:

5 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -46,6 +46,7 @@ linux:build:
    46 46
         #- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp
    
    47 47
         # Regular build using the cross-compiled result or snapshot
    
    48 48
         - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp
    
    49
    +    # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp
    
    49 50
         - bin/make-dist.sh -I dist linux-4
    
    50 51
     
    
    51 52
     linux:test:
    

  • bin/build.sh
    ... ... @@ -130,13 +130,11 @@ buildit ()
    130 130
     	time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; }
    
    131 131
     	if [ "$REBUILD_LISP" = "yes" ]; then
    
    132 132
     	    $TOOLDIR/rebuild-lisp.sh $TARGET
    
    133
    -	else
    
    134
    -	    # Set the LANG to C.  For whatever reason, if I (rtoy) don't
    
    135
    -	    # do this on my openSuSE system, any messages from gcc are
    
    136
    -	    # basically garbled.  This should be harmless on other
    
    137
    -	    # systems.
    
    138
    -	    LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; }
    
    139
    -        fi
    
    133
    +	fi
    
    134
    +	
    
    135
    +	# Set the LANG to C.  For whatever reason, if I (rtoy) don't do this on my openSuSE system,
    
    136
    +	# any messages from gcc are basically garbled.  This should be harmless on other systems.
    
    137
    +	LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; }
    
    140 138
     
    
    141 139
     	if [ "$BUILD_WORLD2" = "yes" ];
    
    142 140
     	then
    

  • src/code/intl.lisp
    ... ... @@ -51,6 +51,7 @@
    51 51
       Use (INTL:TEXTDOMAIN \"whatever\") in each source file to set this.")
    
    52 52
     (defvar *loaded-domains* (make-hash-table :test 'equal))
    
    53 53
     (defvar *locale-aliases* (make-hash-table :test 'equal))
    
    54
    +(setf (gethash "en_US.UTF-8@piglatin" *locale-aliases*) "en@piglatin")
    
    54 55
     
    
    55 56
     (defstruct domain-entry
    
    56 57
       (domain "" :type simple-base-string)
    

  • src/i18n/locale/cmucl.pot
    ... ... @@ -9083,7 +9083,8 @@ msgstr ""
    9083 9083
     #: src/code/extfmts.lisp
    
    9084 9084
     msgid ""
    
    9085 9085
     "The default external format to use if no other external format is\n"
    
    9086
    -"  specified"
    
    9086
    +"  specified.  This is unaffected by any locale settings or by\n"
    
    9087
    +"  SET-SYSTEM-EXTERNAL-FORMAT."
    
    9087 9088
     msgstr ""
    
    9088 9089
     
    
    9089 9090
     #: src/code/extfmts.lisp
    

  • tests/issues.lisp
    ... ... @@ -830,7 +830,18 @@
    830 830
         (assert-true (stream::find-external-format :euckr))
    
    831 831
         (assert-true (stream::find-external-format :cp949))))
    
    832 832
     
    
    833
    -
    
    833
    +(define-test issue.154
    
    834
    +    (:tag :issues)
    
    835
    +  (let ((old-locale intl::*locale*)
    
    836
    +	(locale "en_US.UTF-8@piglatin")
    
    837
    +	(piglatin-text "Ethay izesay ofway away eamstray inway-ufferbay."))
    
    838
    +    (unwind-protect
    
    839
    +	 (progn
    
    840
    +	   (assert-equal locale (intl:setlocale "en_US.UTF-8@piglatin"))
    
    841
    +	   (print (intl::find-domain "cmucl" intl::*locale*))
    
    842
    +	   (assert-equal piglatin-text (intl:dgettext "cmucl" "The size of a stream in-buffer."))
    
    843
    +	   )
    
    844
    +      (intl:setlocale old-locale))))
    
    834 845
     
    
    835 846
     (define-test issue.158
    
    836 847
         (:tag :issues)