Browse Source

* ffcall: updated to 20100903 cvs source
* clisp: rebuild with current ffcall


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5972 ec354946-7b23-47d6-9f5a-488ba84defc7

shaolin 12 years ago
parent
commit
cbba6cd007
2 changed files with 43 additions and 25 deletions
  1. 16 13
      c/clisp/clisp-vl.spec
  2. 27 12
      f/ffcall/ffcall-vl.spec

+ 16 - 13
c/clisp/clisp-vl.spec

@@ -3,7 +3,7 @@
 %define day		25
 %define name 		clisp
 %define version		2.49
-%define release         1%{?_dist_release}
+%define release         2%{?_dist_release}
 %define clisp_build	vine
 
 Summary:      Common Lisp (ANSI CL) implementation
@@ -79,10 +79,10 @@ sed -i 's|http://www.lisp.org/HyperSpec/|http://www.lispworks.com/documentation/
 
 %build
 %ifarch ppc ppc64
-%define opt_flags "$RPM_OPT_FLAGS -DNO_GENERATIONAL_GC -DNO_MULTIMAP_FILE -DNO_SINGLEMAP"
+%define opt_flags "%{optflags} -DNO_GENERATIONAL_GC -DNO_MULTIMAP_FILE -DNO_SINGLEMAP"
 ulimit -s unlimited
 %else
-%define opt_flags "$RPM_OPT_FLAGS"
+%define opt_flags "%{optflags}"
 %endif
 
 ./configure --prefix=%{_prefix} \
@@ -110,21 +110,21 @@ ulimit -s unlimited
             build CFLAGS=%opt_flags
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make -C build DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc/clisp.{dvi,1,ps}
-cp -p doc/mop-spec.pdf $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc
-cp -p doc/*.png $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc
-cp -p doc/Why-CLISP* $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc
-cp -p doc/regexp.html $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc
-find $RPM_BUILD_ROOT%{_libdir} -name '*.dvi' | xargs rm -f
+rm -rf %{buildroot}
+make -C build DESTDIR=%{buildroot} install
+rm -f %{buildroot}%{_docdir}/clisp-%{version}/doc/clisp.{dvi,1,ps}
+cp -p doc/mop-spec.pdf %{buildroot}%{_docdir}/clisp-%{version}/doc
+cp -p doc/*.png %{buildroot}%{_docdir}/clisp-%{version}/doc
+cp -p doc/Why-CLISP* %{buildroot}%{_docdir}/clisp-%{version}/doc
+cp -p doc/regexp.html %{buildroot}%{_docdir}/clisp-%{version}/doc
+find %{buildroot}%{_libdir} -name '*.dvi' | xargs rm -f
 %find_lang %{name}
 %find_lang %{name}low
 cat %{name}low.lang >> %{name}.lang
 
 ## ad-hoc fix <BTS:VineLinux:825>: '--vimdir' option is broken...
-%__mkdir_p $RPM_BUILD_ROOT%{_sysconfdir}/vim
-%__mv $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/after $RPM_BUILD_ROOT%{_sysconfdir}/vim
+%__mkdir_p %{buildroot}%{_sysconfdir}/vim
+%__mv %{buildroot}%{_datadir}/vim/vimfiles/after %{buildroot}%{_sysconfdir}/vim
 
 %clean
 rm -rf %{buildroot}
@@ -141,6 +141,9 @@ rm -rf %{buildroot}
 %doc %{_docdir}/clisp-%{version}
 
 %changelog
+* Fri Mar 23 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.49-2
+- rebuild with current ffcall
+
 * Tue Apr 19 2011 IWAI, Masaharu <iwai@alib.jp> 2.49-1
 - new upstream release
 - ad-hoc fix <BTS:VineLinux:825>: but '--vimdir' option is broken...

+ 27 - 12
f/ffcall/ffcall-vl.spec

@@ -1,12 +1,22 @@
+%define debug_package %{nil}
+
 Name:           ffcall
 Version:        1.10
-Release:        5.20080704cvs.1%{?_dist_release}
+Release:        6.20100903cvs.1%{?_dist_release}
 Summary:        Libraries for foreign function call interfaces
 
 Group:          System Environment/Libraries
 License:        GPLv2+
-URL:            http://www.haible.de/bruno/packages-ffcall-README.html
-Source0:        ftp://ftp.santafe.edu/pub/gnu/ffcall-20080704cvs.tar.bz2
+URL:		http://www.gnu.org/software/libffcall/
+# There has been no official release for several years, and the project web
+# site encourages use of a CVS snapshot.  Make the tarball as follows:
+#   cvs -z3 -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/libffcall 
+#       export -D 2010-09-04 ffcall
+#   tar cJf ffcall-20100903cvs.tar.xz ffcall
+Source0:        ffcall-20100903cvs.tar.xz
+# This patch will not be sent upstream.  It removes the possibility of using
+# mprotect() to make memory executable, as that runs afoul of SELinux.
+Patch0:         ffcall-trampoline.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
@@ -14,26 +24,28 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 This is a collection of four libraries which can be used to build
 foreign function call interfaces in embedded interpreters.
 
-%define debug_package %{nil}
 
 %prep
 %setup -q -n ffcall
+%patch0
+
+find . -name \*.o | xargs rm -f
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+export CFLAGS="%{optflags} -fPIC -DMAP_VARIABLE=2"
 %configure
 make # %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -fr $RPM_BUILD_ROOT%{_datadir}/html
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_mandir}
+make install DESTDIR=%{buildroot}
+rm -fr %{buildroot}%{_datadir}/html
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -49,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 23 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.10-6.20100903cvs.1
+- updated to 20100903 cvs source
+
 * Sat Mar  6 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.10-5.20080704cvs.1
 - initial build for Vine Linux