rpms/cmucl/F-8 cmucl-19e-gcc43.patch, NONE, 1.1 cmucl-19e-optflags.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 cmucl.spec, 1.12, 1.13 sources, 1.4, 1.5 cmucl-19c-motif-shared.patch, 1.1, NONE cmucl-19c-optflags.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Jun 17 00:54:27 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/cmucl/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11566

Modified Files:
	.cvsignore cmucl.spec sources 
Added Files:
	cmucl-19e-gcc43.patch cmucl-19e-optflags.patch 
Removed Files:
	cmucl-19c-motif-shared.patch cmucl-19c-optflags.patch 
Log Message:
* Mon Jun 16 2008 Rex Dieter <rdieter at fedoraproject.org> 19e-1
- cmucl-19e (final)


cmucl-19e-gcc43.patch:

--- NEW FILE cmucl-19e-gcc43.patch ---
diff -up cmucl-19e/src/lisp/x86-assem.S.gcc43 cmucl-19e/src/lisp/x86-assem.S
--- cmucl-19e/src/lisp/x86-assem.S.gcc43	2007-07-06 03:04:39.000000000 -0500
+++ cmucl-19e/src/lisp/x86-assem.S	2008-03-14 19:07:35.000000000 -0500
@@ -81,7 +81,7 @@ FUNCDEF(call_into_c)
 
 /* Check for a return FP value */
 	fxam
-	fnstsw	%eax
+	fnstsw	%ax
 	andl	$0x4500,%eax
 	cmpl	$0x4100,%eax
 	jne	Lfp_rtn_value

cmucl-19e-optflags.patch:

--- NEW FILE cmucl-19e-optflags.patch ---
diff -up cmucl-19e/src/lisp/Config.linux_gencgc.optflags cmucl-19e/src/lisp/Config.linux_gencgc
diff -up cmucl-19e/src/lisp/Config.linux_gencgc.optflags cmucl-19e/src/lisp/Config.linux_gencgc
--- cmucl-19e/src/lisp/Config.linux_gencgc.optflags	2008-04-01 09:49:18.000000000 -0500
+++ cmucl-19e/src/lisp/Config.linux_gencgc	2008-04-21 09:07:28.000000000 -0500
@@ -26,7 +26,7 @@ else
 CPPFLAGS = -D__NO_CTYPE -D_GNU_SOURCE -iquote. -iquote $(PATH1) $(RUNTIME)
 endif
 
-CFLAGS = -rdynamic -Wstrict-prototypes -Wall -O2 -g $(RUNTIME)
+CFLAGS = -rdynamic -Wstrict-prototypes -Wall -O2 -g $(RUNTIME) $(RPM_OPT_FLAGS)
 ASFLAGS = -g $(GENCGC) $(LINKAGE_TABLE)
 NM = $(PATH1)/linux-nm
 UNDEFSYMPATTERN = -Xlinker -u -Xlinker &
diff -up cmucl-19e/src/motif/server/Config.x86.optflags cmucl-19e/src/motif/server/Config.x86
--- cmucl-19e/src/motif/server/Config.x86.optflags	2007-06-11 09:52:55.000000000 -0500
+++ cmucl-19e/src/motif/server/Config.x86	2008-04-21 09:06:24.000000000 -0500
@@ -1,4 +1,4 @@
-CFLAGS = -O2 -I/usr/X11R6/include -I. -I$(VPATH)
+CFLAGS = -O2 -I/usr/X11R6/include -I. -I$(VPATH) $(RPM_OPT_FLAGS)
 LDFLAGS = -L/usr/X11R6/lib
 LIBS = -lXm -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread
 # This def assumes you are building in the same or parallel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmucl/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Dec 2006 19:13:30 -0000	1.5
+++ .cvsignore	17 Jun 2008 00:53:28 -0000	1.6
@@ -1,7 +1,4 @@
-cmucl-19c-x86-linux.tar.bz2
-cmucl-19c-x86-linux.tar.bz2.asc
-cmucl-19d-x86-linux.tar.bz2
-cmucl-19d-x86-linux.tar.bz2.asc
-cmucl-src-19c.tar.bz2
-cmucl-src-19c.tar.bz2.asc
-cmucl-src-19d.tar.bz2
+cmucl-19e-x86-linux.tar.bz2
+cmucl-19e-x86-linux.tar.bz2.asc
+cmucl-src-19e.tar.bz2
+cmucl-src-19e.tar.bz2.asc


Index: cmucl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmucl/F-8/cmucl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cmucl.spec	25 Aug 2007 21:51:12 -0000	1.12
+++ cmucl.spec	17 Jun 2008 00:53:28 -0000	1.13
@@ -1,25 +1,28 @@
 
+#define pre_tag pre2
+#define pre -%{pre_tag}
+
 Summary: CMU Common Lisp compiler
 Name: 	 cmucl
-Version: 19d
-Release: 5%{?dist}
+Version: 19e
+Release: 1%{?dist}
 
 License: BSD 
 Group: 	 Development/Languages
 URL:	 http://www.cons.org/cmucl/
-Source0: http://common-lisp.net/project/cmucl/downloads/release/%{version}/cmucl-src-%{version}.tar.bz2
-#Source1: http://common-lisp.net/project/cmucl/downloads/release/%{version}/cmucl-src-%{version}.tar.bz2.asc
+Source0: http://common-lisp.net/project/cmucl/downloads/release/%{version}%{?pre:/pre-release}/cmucl-src-%{version}%{?pre}.tar.bz2
+Source1: http://common-lisp.net/project/cmucl/downloads/release/%{version}%{?pre:/pre-release}/cmucl-src-%{version}%{?pre}.tar.bz2.asc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # bootstrap available for %%ix86 only: http://bugzilla.redhat.com/185085
 ExclusiveArch: %{ix86}
 
 ## ix86 section
-#Source10: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2
-#Source11: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2.asc
+Source10: http://common-lisp.net/project/cmucl/downloads/release/19e/cmucl-19e-x86-linux.tar.bz2
+Source11: http://common-lisp.net/project/cmucl/downloads/release/19e/cmucl-19e-x86-linux.tar.bz2.asc
 %ifarch %{ix86}
 %define cmucl_arch x86
-%define bootstrap cmucl 
+#define bootstrap cmucl 
 %if "%{?bootstrap}" == "%{nil}"
 %define bootstrap_src -a 10 
 %else
@@ -35,8 +38,8 @@
 #ifarch ppc
 #endif
 
-Patch1: cmucl-19c-motif-shared.patch
-Patch2: cmucl-19c-optflags.patch
+Patch1: cmucl-19e-gcc43.patch
+Patch2: cmucl-19e-optflags.patch
 
 BuildRequires: sed
 BuildRequires: time
@@ -70,7 +73,7 @@
 %prep
 %setup -q -c %{name}-%{version} %{?bootstrap_src}
 
-%patch1 -p1 -b .motif-shared
+%patch1 -p1 -b .gcc43
 %patch2 -p1 -b .optflags
 
 
@@ -111,41 +114,41 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 mkdir -p dist
 pushd dist
 # unarchive newly creating binary dist archives
-tar xvzf ../cmucl-%{version}-%{cmucl_arch}-linux.tar.gz
-tar xvzf ../cmucl-%{version}-%{cmucl_arch}-linux.extra.tar.gz
+tar xvjf ../cmucl-%{version}-%{cmucl_arch}-linux.tar.bz2
+tar xvjf ../cmucl-%{version}-%{cmucl_arch}-linux.extra.tar.bz2
 
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/cmucl/
-cp -a bin $RPM_BUILD_ROOT%{_libdir}/cmucl/
-cp -a lib/cmucl $RPM_BUILD_ROOT%{_libdir}/
+mkdir -p %{buildroot}%{_libdir}/cmucl/
+cp -a bin %{buildroot}%{_libdir}/cmucl/
+cp -a lib/cmucl %{buildroot}%{_libdir}/
 
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -p man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1/
+mkdir -p %{buildroot}%{_mandir}/man1
+install -p man/man1/* %{buildroot}%{_mandir}/man1/
 popd 
 
 ## Setup app-wrapper
-install -m755 -p -D $RPM_BUILD_ROOT%{_libdir}/cmucl/sample-wrapper $RPM_BUILD_ROOT%{_bindir}/cmucl
+install -m755 -p -D %{buildroot}%{_libdir}/cmucl/sample-wrapper %{buildroot}%{_bindir}/cmucl
 # Fixup paths in wrapper
-sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=%{_libdir}/cmucl/lib|" $RPM_BUILD_ROOT%{_bindir}/cmucl
-sed -i -e "s|/<<your-cmucl-path>>|%{_libdir}/cmucl|"      $RPM_BUILD_ROOT%{_bindir}/cmucl
+sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=%{_libdir}/cmucl/lib|" %{buildroot}%{_bindir}/cmucl
+sed -i -e "s|/<<your-cmucl-path>>|%{_libdir}/cmucl|"      %{buildroot}%{_bindir}/cmucl
 # 
-ln -sf cmucl $RPM_BUILD_ROOT%{_bindir}/cmulisp
+ln -sf cmucl %{buildroot}%{_bindir}/cmulisp
 # many apps (ie, maxima) expect to find the wrapper named 'lisp' too
-ln -sf cmucl $RPM_BUILD_ROOT%{_bindir}/lisp
+ln -sf cmucl %{buildroot}%{_bindir}/lisp
 
 ## Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/cmucl/sample-wrapper
+rm -f %{buildroot}%{_libdir}/cmucl/sample-wrapper
 
-# lisp.core contains environment used to build, including RPM_BUILD_ROOT
+# lisp.core contains environment used to build, including %{buildroot} 
 QA_SKIP_BUILD_ROOT=1; export QA_SKIP_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc dist/doc/cmucl/README dist/doc/cmucl/release*.txt
 %{_bindir}/cmucl
 %{_bindir}/cmulisp
@@ -158,8 +161,13 @@
 %{_libdir}/cmucl/lib/load-foreign.csh
 %{_libdir}/cmucl/lib/config
 %{_libdir}/cmucl/lib/config.lisp
+%{_libdir}/cmucl/lib/ext-formats/
 %{_libdir}/cmucl/lib/generic-site.lisp
+%{_libdir}/cmucl/lib/Linux-cmucl-linker-script
+%{_libdir}/cmucl/lib/linker.sh
+%{_libdir}/cmucl/lib/lisp.a
 %dir %{_libdir}/cmucl/lib/subsystems
+%{_libdir}/cmucl/lib/subsystems/external-formats-library.*
 %{_libdir}/cmucl/lib/subsystems/gray-*-library.*
 %{_libdir}/cmucl/lib/subsystems/iodefs-library.*
 %{_libdir}/cmucl/lib/subsystems/simple-*-library.*
@@ -169,7 +177,7 @@
 %{_mandir}/man1/*
 
 %files extras
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/cmucl/lib/subsystems/clx-library.*
 %{_libdir}/cmucl/lib/subsystems/hemlock-library.*
 %{_libdir}/cmucl/lib/subsystems/clm-library.*
@@ -182,10 +190,25 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jun 16 2008 Rex Dieter <rdieter at fedoraproject.org> 19e-1
+- cmucl-19e (final)
+
+* Mon Apr 21 2008 Rex Dieter <rdieter at fedoraproject.org> 19e-0.3.pre2
+- cmucl-19e-pre2
+
+* Fri Mar 14 2008 Rex Dieter <rdieter at fedoraproject.org> 19e-0.2.pre1
+- gcc43 patch
+
+* Thu Mar 13 2008 Rex Dieter <rdieter at fedoraproject.org> 19e-0.1.pre1
+- cmucl-19e-pre1
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 19d-6
+- Autorebuild for GCC 4.3
+
 * Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 19d-5
 - respin (BuildID)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmucl/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Nov 2006 16:47:57 -0000	1.4
+++ sources	17 Jun 2008 00:53:28 -0000	1.5
@@ -1,3 +1,4 @@
-806b3c1a9f68caa9106a5d03cf7bebce  cmucl-19d-x86-linux.tar.bz2.asc
-802cd8b05e376ff04c9006dd04f5bc7e  cmucl-19d-x86-linux.tar.bz2
-3a3dba371a7e1db7fa4b8f338acd72a3  cmucl-src-19d.tar.bz2
+d88262b3a6d65a83683290e5fd4097b3  cmucl-19e-x86-linux.tar.bz2
+cb9982e357b89a67eb7579a8f111bbd3  cmucl-19e-x86-linux.tar.bz2.asc
+f6e236bc404afc3952b36a3fd6d8ec79  cmucl-src-19e.tar.bz2
+e88c9ca855c22506cf3e34cddc417929  cmucl-src-19e.tar.bz2.asc


--- cmucl-19c-motif-shared.patch DELETED ---


--- cmucl-19c-optflags.patch DELETED ---




More information about the fedora-extras-commits mailing list