[arch-commits] Commit in sbcl/repos/extra-x86_64 (7 files)

Jürgen Hötzel juergen at nymeria.archlinux.org
Fri May 10 07:03:40 EDT 2013


    Date: Friday, May 10, 2013 @ 13:03:40
  Author: juergen
Revision: 185024

archrelease: copy trunk to extra-x86_64

Added:
  sbcl/repos/extra-x86_64/PKGBUILD
    (from rev 185023, sbcl/trunk/PKGBUILD)
  sbcl/repos/extra-x86_64/arch-fixes.lisp
    (from rev 185023, sbcl/trunk/arch-fixes.lisp)
  sbcl/repos/extra-x86_64/sbcl.install
    (from rev 185023, sbcl/trunk/sbcl.install)
  sbcl/repos/extra-x86_64/texinfo-4.13a-data_types.patch
    (from rev 185023, sbcl/trunk/texinfo-4.13a-data_types.patch)
Deleted:
  sbcl/repos/extra-x86_64/PKGBUILD
  sbcl/repos/extra-x86_64/arch-fixes.lisp
  sbcl/repos/extra-x86_64/sbcl.install

--------------------------------+
 PKGBUILD                       |  160 +++++++++++++++++++++------------------
 arch-fixes.lisp                |   42 +++++-----
 sbcl.install                   |   36 ++++----
 texinfo-4.13a-data_types.patch |   32 +++++++
 4 files changed, 161 insertions(+), 109 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-10 10:58:19 UTC (rev 185023)
+++ PKGBUILD	2013-05-10 11:03:40 UTC (rev 185024)
@@ -1,70 +0,0 @@
-# $Id$
-# Contributor: John Proctor <jproctor at prium.net>
-# Contributor: Daniel White <daniel at whitehouse.id.au>
-# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
-# Contributor: Leslie Polzer (skypher)
-
-pkgname=sbcl
-pkgver=1.1.4
-pkgrel=1
-pkgdesc="Steel Bank Common Lisp"
-url="http://www.sbcl.org/"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('glibc' 'zlib')
-provides=('common-lisp' 'cl-asdf')
-makedepends=('sbcl' 'texinfo')
-install=sbcl.install
-source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
-        "arch-fixes.lisp")
-md5sums=('9d82ec89abbaf265fbfc71a24445dd66'
-         '7ac0c1936547f4278198b8bf7725204d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  export CFLAGS+=" -D_GNU_SOURCE -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
-  export GNUMAKE="make -e"
-
-  # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS
-  export LINKFLAGS="$LDFLAGS"
-  unset LDFLAGS
-
-  # Make a multi-threaded SBCL, disable LARGEFILE
-  cat >customize-target-features.lisp <<EOF
-(lambda (features)
-  (flet ((enable (x) (pushnew x features))
-         (disable (x) (setf features (remove x features))))
-  (enable :sb-thread)
-  (enable :sb-core-compression)
-  (disable :largefile)))
-EOF
-
-  sh make.sh sbcl
-  make -C doc/manual info
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  INSTALL_ROOT="$pkgdir/usr" sh install.sh
-
-  src/runtime/sbcl --core output/sbcl.core --script "${srcdir}/arch-fixes.lisp"
-  mv sbcl-new.core "${pkgdir}/usr/lib/sbcl/sbcl.core"
-
-  # sources
-  mkdir -p "$pkgdir/usr/share/sbcl-source"
-  cp -R -t "$pkgdir/usr/share/sbcl-source" "$srcdir/$pkgname-$pkgver/"{src,contrib}
-
-  # license
-  install -D -m644 "$srcdir/$pkgname-$pkgver/COPYING" \
-                   "$pkgdir/usr/share/licenses/$pkgname/license.txt"
-
-  # drop unwanted files
-  find "$pkgdir" \( -name Makefile -o -name .cvsignore \) -delete
-  find "$pkgdir/usr/share/sbcl-source" -type f \
-    \( -name \*.fasl -o -name \*.o -o -name \*.log -o -name \*.so -o -name a.out \) -delete
-
-  rm "$pkgdir/usr/share/sbcl-source/src/runtime/sbcl"{,.nm}
-
-}

Copied: sbcl/repos/extra-x86_64/PKGBUILD (from rev 185023, sbcl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-05-10 11:03:40 UTC (rev 185024)
@@ -0,0 +1,90 @@
+# $Id$
+# Contributor: John Proctor <jproctor at prium.net>
+# Contributor: Daniel White <daniel at whitehouse.id.au>
+# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Leslie Polzer (skypher)
+
+pkgname=sbcl
+pkgver=1.1.7
+pkgrel=1
+pkgdesc="Steel Bank Common Lisp"
+url="http://www.sbcl.org/"
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('glibc' 'zlib')
+provides=('common-lisp' 'cl-asdf')
+makedepends=('sbcl')
+install=sbcl.install
+source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
+  "arch-fixes.lisp"
+  "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz"
+  "texinfo-4.13a-data_types.patch")
+md5sums=('ca3dd0ce2943e10a1c86ff5f40db3f85'
+         '7ac0c1936547f4278198b8bf7725204d'
+         '71ba711519209b5fb583fed2b3d86fcb'
+         'd8574782ff7def1e2dc5c291dbeaec18')
+
+
+# Temporary Texinfo legacy build
+# See: http://sourceforge.net/mailarchive/message.php?msg_id=30747919
+
+build-texinfo-legacy() {
+  cd ${srcdir}/texinfo-4.13
+  patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch
+  mkdir -p $srcdir/texinfo-instroot
+  ./configure --prefix=$srcdir/texinfo-instroot
+  make install
+}
+
+build() {
+  build-texinfo-legacy
+  export PATH=$srcdir/texinfo-instroot/bin:$PATH
+
+  cd "$srcdir/$pkgname-$pkgver"
+
+  export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=\\\"/usr/lib/sbcl\\\""
+  export GNUMAKE="make"
+
+  # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS
+  export LINKFLAGS="$LDFLAGS"
+  unset LDFLAGS
+
+  # Make a multi-threaded SBCL, disable LARGEFILE
+  cat >customize-target-features.lisp <<EOF
+(lambda (features)
+  (flet ((enable (x) (pushnew x features))
+         (disable (x) (setf features (remove x features))))
+  (enable :sb-thread)
+  (enable :sb-core-compression)
+  (disable :largefile)))
+EOF
+
+  sh make.sh sbcl
+  make -C doc/manual info
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  SBCL_HOME=""                  # cannot have both SBCL_HOME and INSTALL_ROOT
+  INSTALL_ROOT="$pkgdir/usr" sh install.sh
+
+  src/runtime/sbcl --core output/sbcl.core --script "${srcdir}/arch-fixes.lisp"
+  mv sbcl-new.core "${pkgdir}/usr/lib/sbcl/sbcl.core"
+
+  # sources
+  mkdir -p "$pkgdir/usr/share/sbcl-source"
+  cp -R -t "$pkgdir/usr/share/sbcl-source" "$srcdir/$pkgname-$pkgver/"{src,contrib}
+
+  # license
+  install -D -m644 "$srcdir/$pkgname-$pkgver/COPYING" \
+                   "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+
+  # drop unwanted files
+  find "$pkgdir" \( -name Makefile -o -name .cvsignore \) -delete
+  find "$pkgdir/usr/share/sbcl-source" -type f \
+    \( -name \*.fasl -o -name \*.o -o -name \*.log -o -name \*.so -o -name a.out \) -delete
+
+  rm "$pkgdir/usr/share/sbcl-source/src/runtime/sbcl"{,.nm}
+
+}

Deleted: arch-fixes.lisp
===================================================================
--- arch-fixes.lisp	2013-05-10 10:58:19 UTC (rev 185023)
+++ arch-fixes.lisp	2013-05-10 11:03:40 UTC (rev 185024)
@@ -1,21 +0,0 @@
-(in-package "COMMON-LISP-USER")
-
-(let* ((parent (make-pathname :directory '(:absolute "usr" "share" "sbcl-source")))
-       (src
-	(merge-pathnames
-	 (make-pathname :directory '(:relative "src" :wild-inferiors)
-			:name :wild :type :wild)
-	 parent))
-         (contrib
-          (merge-pathnames
-           (make-pathname :directory '(:relative "contrib" :wild-inferiors)
-                          :name :wild :type :wild)
-           parent)))
-  (setf (logical-pathname-translations "SYS")
-	`(("SYS:SRC;**;*.*.*" ,src)
-	  ("SYS:CONTRIB;**;*.*.*" ,contrib))))
-
-(ignore-errors
-  (sb-ext:gc :full t)
-  (sb-ext:enable-debugger)
-  (sb-ext:save-lisp-and-die "sbcl-new.core"))

Copied: sbcl/repos/extra-x86_64/arch-fixes.lisp (from rev 185023, sbcl/trunk/arch-fixes.lisp)
===================================================================
--- arch-fixes.lisp	                        (rev 0)
+++ arch-fixes.lisp	2013-05-10 11:03:40 UTC (rev 185024)
@@ -0,0 +1,21 @@
+(in-package "COMMON-LISP-USER")
+
+(let* ((parent (make-pathname :directory '(:absolute "usr" "share" "sbcl-source")))
+       (src
+	(merge-pathnames
+	 (make-pathname :directory '(:relative "src" :wild-inferiors)
+			:name :wild :type :wild)
+	 parent))
+         (contrib
+          (merge-pathnames
+           (make-pathname :directory '(:relative "contrib" :wild-inferiors)
+                          :name :wild :type :wild)
+           parent)))
+  (setf (logical-pathname-translations "SYS")
+	`(("SYS:SRC;**;*.*.*" ,src)
+	  ("SYS:CONTRIB;**;*.*.*" ,contrib))))
+
+(ignore-errors
+  (sb-ext:gc :full t)
+  (sb-ext:enable-debugger)
+  (sb-ext:save-lisp-and-die "sbcl-new.core"))

Deleted: sbcl.install
===================================================================
--- sbcl.install	2013-05-10 10:58:19 UTC (rev 185023)
+++ sbcl.install	2013-05-10 11:03:40 UTC (rev 185024)
@@ -1,18 +0,0 @@
-info_dir=/usr/share/info
-info_files=(asdf.info sbcl.info)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}

Copied: sbcl/repos/extra-x86_64/sbcl.install (from rev 185023, sbcl/trunk/sbcl.install)
===================================================================
--- sbcl.install	                        (rev 0)
+++ sbcl.install	2013-05-10 11:03:40 UTC (rev 185024)
@@ -0,0 +1,18 @@
+info_dir=/usr/share/info
+info_files=(asdf.info sbcl.info)
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}

Copied: sbcl/repos/extra-x86_64/texinfo-4.13a-data_types.patch (from rev 185023, sbcl/trunk/texinfo-4.13a-data_types.patch)
===================================================================
--- texinfo-4.13a-data_types.patch	                        (rev 0)
+++ texinfo-4.13a-data_types.patch	2013-05-10 11:03:40 UTC (rev 185024)
@@ -0,0 +1,32 @@
+diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c
+--- texinfo-4.13/info/window.c_old	2009-08-04 13:46:15.000000000 +0200
++++ texinfo-4.13/info/window.c	2009-08-04 13:47:29.000000000 +0200
+@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st
+       const char *carried_over_ptr;
+       size_t carried_over_len, carried_over_count;
+       const char *cur_ptr = mbi_cur_ptr (iter);
+-      int cur_len = mb_len (mbi_cur (iter));
++      size_t cur_len = mb_len (mbi_cur (iter));
+       int replen;
+       int delim = 0;
+       int rc;
+@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage)
+        mbi_advance (iter))
+     {
+       const char *cur_ptr = mbi_cur_ptr (iter);
+-      int cur_len = mb_len (mbi_cur (iter));
++      size_t cur_len = mb_len (mbi_cur (iter));
+ 
+       if (cur_len == 1)
+ 	{
+@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line,
+        mbi_advance (iter))
+     {
+       const char *cur_ptr = mbi_cur_ptr (iter);
+-      int cur_len = mb_len (mbi_cur (iter));
+-      int replen;
++      size_t cur_len = mb_len (mbi_cur (iter));
++      size_t replen;
+ 
+       if (cur_ptr >= endp)
+ 	break;



More information about the arch-commits mailing list