[arch-commits] Commit in cmucl/trunk (3 files)

[Juergen Hoetzel]

    Date: Thursday, September 4, 2008 @ 09:25:44
  Author: juergen
Revision: 11830

fixed Makefile dependencies (failure on -j2 build), removed old xorg patch

Added:
  cmucl/trunk/cmucl-19e-GNUmakefile.patch
Modified:
  cmucl/trunk/PKGBUILD
Deleted:
  cmucl/trunk/cmucl-19c-xorg.patch

-----------------------------+
 PKGBUILD                    |   44 +++++++++++++++++++-----------------------
 cmucl-19c-xorg.patch        |   13 ------------
 cmucl-19e-GNUmakefile.patch |   17 ++++++++++++++++
 3 files changed, 37 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-04 13:13:09 UTC (rev 11829)
+++ PKGBUILD	2008-09-04 13:25:44 UTC (rev 11830)
@@ -3,54 +3,50 @@
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=cmucl
-pkgver=19d
+pkgver=19e
 pkgrel=1
 pkgdesc="CMU Common Lisp"
 depends=('glibc' 'lesstif')
 makedepends=('sed' 'bc')
 #license PublicDomain
 source=(http://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-src-${pkgver}.tar.bz2 \
-    http://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2 \
-		cmucl-19c-xorg.patch)
-md5sums=('3a3dba371a7e1db7fa4b8f338acd72a3' '802cd8b05e376ff04c9006dd04f5bc7e'\
-         '13b083f9cf3c2f17f88c60b02edcd63c')
+    http://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2\
+    cmucl-${pkgver}-GNUmakefile.patch)
+md5sums=('f6e236bc404afc3952b36a3fd6d8ec79' 'd88262b3a6d65a83683290e5fd4097b3'\
+         'd2659f8c70328f55e5554adc594934e5')
 url="http://www.cons.org/cmucl/"
+arch=(i686)
 
 build() {
   cd $startdir/src
-  (cd src && patch -p1 -i $startdir/src/cmucl-19c-xorg.patch) || return 1
+  patch -p0 -i $startdir/src/cmucl-${pkgver}-GNUmakefile.patch  || return 1
   export CMUCLCORE=$startdir/src/lib/cmucl/lib/lisp.core
   # Create target buildroot
-  ./src/tools/create-target.sh $CHOST linux_gencgc
+  ./src/tools/create-target.sh $CHOST 
   # Use binary-dist lisp to create initial kernel.core
-  ./src/tools/build-world.sh $CHOST bin/lisp
+  ./src/tools/build-world.sh $CHOST $startdir/src/bin/lisp
   # build native lisp binary
   ./src/tools/rebuild-lisp.sh $CHOST 
   # Generate lisp.core
-  ./src/tools/load-world.sh $CHOST "$pkgver archlinux release $pkgver"
+  ./src/tools/load-world.sh $CHOST  ${pkgver}
   # rebuild kernel.core using native lisp 
   ./src/tools/build-world.sh $CHOST $CHOST/lisp/lisp
-  # (Re)generate lisp.core
-  ./src/tools/load-world.sh $CHOST "$pkgver archlinux release $pkgver"
+  # "(Re)generate lisp.core"
+  ./src/tools/load-world.sh $CHOST ${pkgver} 
   # Build auxilary stuff
   ./src/tools/build-utils.sh $CHOST 
   # make new binary dist archives
   ./src/tools/make-dist.sh $CHOST ${pkgver} x86 linux
-
+  
+  mkdir -p $startdir/pkg/usr/lib/cmucl/
+  mkdir -p $startdir/pkg/usr/share/man/man1
   mkdir dist
-  pushd dist
-  # unarchive newly creating binary dist archives
-  tar xvzf ../cmucl-${pkgver}-x86-linux.tar.gz
-  tar xvzf ../cmucl-${pkgver}-x86-linux.extra.tar.gz
+  tar xjf cmucl-${pkgver}-x86-linux.tar.bz2 -C dist 
+  tar xjf cmucl-${pkgver}-x86-linux.extra.tar.bz2 -C dist
+  cp -a dist/bin ${startdir}/pkg/usr/lib/cmucl
+  cp -a dist/lib/cmucl ${startdir}/pkg/usr/lib/ 
+  cp -a dist/man/man1 ${startdir}/pkg/usr/share/man/man1 
 
-  mkdir -p $startdir/pkg/usr/lib/cmucl/
-  cp -a bin $startdir/pkg/usr/lib/cmucl/
-  cp -a lib/cmucl $startdir/pkg/usr/lib/
-
-  mkdir -p $startdir/pkg/usr/man/man1
-  install -p man/man1/* $startdir/pkg/usr/man/man1/
-  popd 
-
   ## Setup app-wrapper
   install -m755 -p -D lib/cmucl/sample-wrapper $startdir/pkg/usr/bin/cmucl
   # Fixup paths in wrapper

Deleted: cmucl-19c-xorg.patch
===================================================================
--- cmucl-19c-xorg.patch	2008-09-04 13:13:09 UTC (rev 11829)
+++ cmucl-19c-xorg.patch	2008-09-04 13:25:44 UTC (rev 11830)
@@ -1,13 +0,0 @@
-diff -ur src.orig/motif/server/Config.x86 src/motif/server/Config.x86
---- src.orig/motif/server/Config.x86	2004-04-26 14:07:36.000000000 +0200
-+++ src/motif/server/Config.x86	2006-01-04 18:12:39.000000000 +0100
-@@ -1,6 +1,6 @@
--CFLAGS = -O2 -I/usr/X11R6/include -I. -I$(VPATH)
--LDFLAGS = -L/usr/X11R6/lib
--LIBS = -static -lXm -dynamic -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread
-+CFLAGS = -O2 -I/usr/include -I. -I$(VPATH)
-+LDFLAGS = -L/usr/lib
-+LIBS = -lXau -lXdmcp -lXm -dynamic -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread
- # This def assumes you are building in the same or parallel
- # tree to the CVS souce layout. Sites may need to customize
- # this path.

Added: cmucl-19e-GNUmakefile.patch
===================================================================
--- cmucl-19e-GNUmakefile.patch	                        (rev 0)
+++ cmucl-19e-GNUmakefile.patch	2008-09-04 13:25:44 UTC (rev 11830)
@@ -0,0 +1,17 @@
+diff -urb src.old/lisp/GNUmakefile src/lisp/GNUmakefile
+--- src.old/lisp/GNUmakefile	2008-01-18 15:31:50.000000000 +0100
++++ src/lisp/GNUmakefile	2008-09-04 14:37:22.000000000 +0200
+@@ -30,10 +30,12 @@
+ 	$(NM) lisp | grep -v " [F] " >> ,lisp.nm
+ 	mv ,lisp.nm lisp.nm
+ 
+-lisp: version.c ${OBJS} version
++version.o: version.c version
+ 	echo '1 + ' `cat version` | bc > ,version
+ 	mv ,version version
+ 	$(CC) ${CFLAGS} -DVERSION=`cat version` -c $<
++
++lisp: ${OBJS} version.o
+ 	$(CC) -g ${OS_LINK_FLAGS} -o ,lisp \
+ 		${OBJS} version.o \
+ 		${OS_LIBS} -lm