rpms/ecl/devel ecl-0.9i-gcc41.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ecl.spec, 1.3, 1.4 sources, 1.2, 1.3
Gérard Milmeister (gemi)
fedora-extras-commits at redhat.com
Sat Jul 8 13:33:18 UTC 2006
Author: gemi
Update of /cvs/extras/rpms/ecl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29973/devel
Modified Files:
.cvsignore ecl.spec sources
Added Files:
ecl-0.9i-gcc41.patch
Log Message:
new version 0.9i
ecl-0.9i-gcc41.patch:
--- NEW FILE ecl-0.9i-gcc41.patch ---
--- ecl-0.9i/contrib/sockets/sockets.lisp.gcc41 2006-06-30 20:08:56.000000000 +0200
+++ ecl-0.9i/contrib/sockets/sockets.lisp 2006-06-30 21:08:24.000000000 +0200
@@ -437,7 +437,7 @@
if (t == t_base_string) {
ok = (size < x->base_string.dim);
} else if (t == t_vector) {
- cl_elttype aet = x->vector.elttype;
+ cl_elttype aet = (cl_elttype)x->vector.elttype;
if (aet == aet_b8 || aet == aet_i8 || aet == aet_bc) {
ok = (size < x->vector.dim);
} else if (aet == aet_fix || aet == aet_index) {
@@ -567,7 +567,7 @@
"{
struct sockaddr_in sockaddr;
int addr_len = sizeof(struct sockaddr_in);
- int new_fd = accept(#0, (struct sockaddr*)&sockaddr, &addr_len);
+ int new_fd = accept(#0, (struct sockaddr*)&sockaddr, (socklen_t*)&addr_len);
@(return 0) = new_fd;
@(return 1) = Cnil;
@@ -769,10 +769,10 @@
sockaddr.sun_len = sizeof(struct sockaddr_un);
#endif
sockaddr.sun_family = #2;
- strncpy(&sockaddr.sun_path,#1,sizeof(sockaddr.sun_path));
+ strncpy((char*)&sockaddr.sun_path,#1,sizeof(sockaddr.sun_path));
sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
- @(return) = bind(#0,&sockaddr, sizeof(struct sockaddr_un));
+ @(return) = bind(#0,(struct sockaddr*)&sockaddr, sizeof(struct sockaddr_un));
}"))
(socket-error "bind"))))
@@ -782,9 +782,9 @@
"{
struct sockaddr_un sockaddr;
int addr_len = sizeof(struct sockaddr_un);
- int new_fd = accept(#0, &sockaddr, &addr_len);
+ int new_fd = accept(#0, (struct sockaddr*)&sockaddr, (socklen_t*)&addr_len);
@(return 0) = new_fd;
- @(return 1) = (new_fd == -1) ? Cnil : make_base_string_copy(&sockaddr.sun_path);
+ @(return 1) = (new_fd == -1) ? Cnil : make_base_string_copy((char*)&sockaddr.sun_path);
}")
(cond
((= fd -1)
@@ -812,10 +812,10 @@
sockaddr.sun_len = sizeof(struct sockaddr_un);
#endif
sockaddr.sun_family = #1;
- strncpy(&sockaddr.sun_path,#2,sizeof(sockaddr.sun_path));
+ strncpy((char*)&sockaddr.sun_path,#2,sizeof(sockaddr.sun_path));
sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
- @(return) = connect(#0,&sockaddr, sizeof(struct sockaddr_un));
+ @(return) = connect(#0,(struct sockaddr*)&sockaddr, sizeof(struct sockaddr_un));
}"))
(socket-error "connect"))))
@@ -826,10 +826,10 @@
{
struct sockaddr_un name;
socklen_t len = sizeof(struct sockaddr_un);
- int ret = getpeername(#0,&name,&len);
+ int ret = getpeername(#0,(struct sockaddr*)&name,&len);
if (ret == 0) {
- @(return) = make_base_string_copy(&name.sun_path);
+ @(return) = make_base_string_copy((char*)&name.sun_path);
} else {
@(return) = Cnil;
}
@@ -1104,7 +1104,7 @@
buffering)
(t :int :int :object)
t
- "si_set_buffering_mode(ecl_make_stream_from_fd(#0,#1,#2), #3)"
+ "si_set_buffering_mode(ecl_make_stream_from_fd(#0,#1,(ecl_smmode)#2), #3)"
:one-liner t))
(defmethod socket-make-stream ((socket socket) &rest args &key (buffering-mode NIL))
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 14 Mar 2006 07:56:15 -0000 1.2
+++ .cvsignore 8 Jul 2006 13:33:17 -0000 1.3
@@ -1 +1 @@
-ecl-0.9h.tgz
+ecl-0.9i.tgz
Index: ecl.spec
===================================================================
RCS file: /cvs/extras/rpms/ecl/devel/ecl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ecl.spec 15 Mar 2006 16:37:45 -0000 1.3
+++ ecl.spec 8 Jul 2006 13:33:18 -0000 1.4
@@ -1,19 +1,19 @@
Name: ecl
-Version: 0.9h
-Release: 5%{?dist}
+Version: 0.9i
+Release: 1%{?dist}
Summary: Embeddable Common-Lisp
Group: Development/Languages
License: LGPL
URL: http://ecls.sourceforge.net
-Source0: http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-0.9h.tgz
-Patch0: ecl-gcc41.patch
+Source0: http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-0.9i.tgz
+Patch1: ecl-0.9i-gcc41.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel
BuildRequires: m4
BuildRequires: texinfo
-Requires(post): /sbin/install-info
-Requires(postun): /sbin/install-info
+Requires(post): /sbin/install-info, policycoreutils
+Requires(postun): /sbin/install-info, policycoreutils
%description
ECL (Embeddable Common-Lisp) is an interpreter of the Common-Lisp
@@ -24,11 +24,14 @@
# no -devel package for header files is split off
# since they are required by the main package
+
%prep
%setup0 -q
-%patch0 -p1
+%patch1 -p1
# wrong character in texinfo file
perl -pi -e 's|\xc7||' src/doc/user.txi
+# set rpath to the final path
+perl -pi -e 's|-Wl,--rpath,~A|-Wl,--rpath,%{_libdir}/ecl|' src/configure
%build
@@ -39,13 +42,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{_prefix} \
- bindir=$RPM_BUILD_ROOT%{_bindir} \
- libdir=$RPM_BUILD_ROOT%{_libdir}/ecl \
- mandir=$RPM_BUILD_ROOT%{_mandir} \
- docdir=$RPM_BUILD_ROOT%{_docdir} \
- infodir=$RPM_BUILD_ROOT%{_infodir} \
- install
+make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -fr $RPM_BUILD_ROOT%{_docdir}
@@ -55,12 +52,15 @@
%post
/sbin/install-info %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
/sbin/install-info %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
+/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/ecl/libecl.so" 2>/dev/null || :
+/sbin/restorecon "%{_libdir}/ecl/libecl.so" 2> /dev/null || :
%postun
if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
/sbin/install-info --delete %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
+ /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/ecl/libecl.so" 2>/dev/null || :
fi
@@ -79,6 +79,9 @@
%changelog
+* Sat Jul 8 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.9i-1
+- new version 0.9i
+
* Wed Mar 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.9h-5
- patch for gcc 4.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 14 Mar 2006 07:56:15 -0000 1.2
+++ sources 8 Jul 2006 13:33:18 -0000 1.3
@@ -1 +1 @@
-d02ae5ce7fa48fe534666ce853aaa27e ecl-0.9h.tgz
+ea47c0a9f47c510ff4654b44b004537a ecl-0.9i.tgz
More information about the fedora-extras-commits
mailing list