[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Agggh! 64-bit bug still present in 1.3.2 [PATCH]

From: Toby Johnson <toby_at_etjohnson.us>
Date: 2006-06-21 06:54:48 CEST

David Summers wrote:
>
> On Mon, 5 Jun 2006, Toby Johnson wrote:
>
>> Nico Kadel-Garcia wrote:
>>> My latest patch is at:
>>>
>>>
>>> http://subversion.tigris.org/nonav/issues/showattachment.cgi/558/x86_64.patch
>>
>>
>> Nico, as long as we're replacing hardcoded paths with built-in
>> rpmbuild macros, shouldn't the following substitutions also be made?
>>
>> /usr/bin => %{_bindir}
>> /usr/include => %{_includedir}
>> /usr/share/man => %{_mandir}
>> /usr/share => %{_datadir}
>>
>
> If someone could try the latest trunk and see if my /usr/bin ->
> %{_bindir}
> and /usr/lib -> %{_libdir} has helped 64-bit users at all and let me
> know, it would be appreciated.
>
> I still don't have a 64-bit system but I will soon order one (yay,
> more toys) so hopefully soon I'll be able to verify this stuff.
>
> Until then, I either need feedback from someone else or if someone
> could offer a login on a 64-bit system for a while that would be
> appreciated.
>
> If we can get a clean 64-bit RPM build on trunk then we can back-port
> to 1.4.x and/or 1.3.x.
>

Hello David, I finished running without checks enabled on 64-bit
CentOS-4 and hit a couple snags, which the attached patch corrects (just
a couple more missed /usr/lib64 locations). I'm assuming the patch
can/should be applied for the other distros as well but I currently have
no means of testing those.

The Makefile for building the RPMs still doesn't work, due to the
hardcoded 32-bit paths in there, but I'm not really worried about
that... it makes it up to and including creation of the RPMs anyway.

I'll run again with full tests and let you know if I find anything else.

toby

Index: subversion.spec
===================================================================
--- subversion.spec (revision 20204)
+++ subversion.spec (working copy)
@@ -573,7 +573,7 @@
 make install-swig-pl DESTDIR=$RPM_BUILD_ROOT

 # Clean up unneeded files for package installation
-rm -rf $RPM_BUILD_ROOT/%{_prefix}/lib/perl5/%{perl_version}
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perl_version}

 # Set up tools package files.
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/subversion
@@ -633,8 +633,8 @@
 %files -n mod_dav_svn
 %defattr(-,root,root)
 %config(noreplace) /etc/httpd/conf.d/subversion.conf
-%{apache_dir}/lib/httpd/modules/mod_dav_svn.so
-%{apache_dir}/lib/httpd/modules/mod_authz_svn.so
+%{_libdir}/httpd/modules/mod_dav_svn.so
+%{_libdir}/httpd/modules/mod_authz_svn.so

 %files perl
 %defattr(-,root,root)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 21 06:54:30 2006

This is an archived mail posted to the Subversion Dev mailing list.