[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 already in issue tracker)

From: Toby Johnson <toby_at_etjohnson.us>
Date: 2006-06-06 16:56:19 CEST

David James wrote:
> On 6/5/06, Toby Johnson <toby@etjohnson.us> wrote:
>> David James wrote:
>>
>> > Toby, can you test Nico's patch and confirm that it
>> >
>> I assume you meant to finish this sentence with "confirm that it
>> compiles", so yes, I'll confirm it tonight.
>
> Thanks! I just want to make sure the fix is good before we release it :)
>
> Cheers,
>
> David

Hello all, I still have a few issues with building the RPMs on x86-64
using Nico's latest patch.

Issue 1. rmbuild is not able to apply apr.patch cleanly on trunk, since
configure.in has changed and no longer matches. See apr.patch.patch
(attached) for fix.

Issue 2. The "chrpath" call failed for me:

--- 8< ----- snip ----- >8 ---
+ chrpath -r /usr/lib64
/home/toby/rpms/tmp/subversion-1.5.0-19957/usr/lib64/httpd/modules/mod_authz_svn.so
/home/toby/rpms/tmp/subversion-1.5.0-19957/usr/lib64/httpd/modules/mod_authz_svn.so:
no rpath or runpath tag found.
error: Bad exit status from /home/toby/rpms/tmp/rpm-tmp.51994 (%install)

RPM build errors:
    Bad exit status from /home/toby/rpms/tmp/rpm-tmp.51994 (%install)
make: *** [build_rpm_files] Error 1
--- 8< ----- snip ----- >8 ---

I'm not very familiar w/ chrpath, but ldd seemed to indicate that
mod_authz_svn.so was indeed finding all its libraries:

--- 8< ----- snip ----- >8 ---
        libsvn_subr-1.so.0 => /usr/lib64/libsvn_subr-1.so.0
(0x0000002a95667000)
        libsvn_repos-1.so.0 => /usr/lib64/libsvn_repos-1.so.0
(0x0000002a95793000)
        libz.so.1 => /usr/lib64/libz.so.1 (0x0000002a958b2000)
        libpthread.so.0 => /lib64/tls/libpthread.so.0 (0x0000002a959c7000)
        libc.so.6 => /lib64/tls/libc.so.6 (0x0000002a95adc000)
        libaprutil-0.so.0 => /usr/lib64/libaprutil-0.so.0
(0x0000002a95d0f000)
        libldap-2.2.so.7 => /usr/lib64/libldap-2.2.so.7 (0x0000002a95e28000)
        liblber-2.2.so.7 => /usr/lib64/liblber-2.2.so.7 (0x0000002a95f5e000)
        libdb-4.2.so => /lib64/tls/libdb-4.2.so (0x0000002a9606c000)
        libexpat.so.0 => /usr/lib64/libexpat.so.0 (0x0000002a9624c000)
        libapr-0.so.0 => /usr/lib64/libapr-0.so.0 (0x0000002a9636e000)
        librt.so.1 => /lib64/tls/librt.so.1 (0x0000002a9649a000)
        libm.so.6 => /lib64/tls/libm.so.6 (0x0000002a965b5000)
        libcrypt.so.1 => /lib64/libcrypt.so.1 (0x0000002a9673b000)
        libdl.so.2 => /lib64/libdl.so.2 (0x0000002a9686f000)
        libsvn_fs-1.so.0 => /usr/lib64/libsvn_fs-1.so.0 (0x0000002a96973000)
        libsvn_delta-1.so.0 => /usr/lib64/libsvn_delta-1.so.0
(0x0000002a96a79000)
        /lib64/ld-linux-x86-64.so.2 (0x000000552aaaa000)
        libresolv.so.2 => /lib64/libresolv.so.2 (0x0000002a96b82000)
        libsasl2.so.2 => /usr/lib64/libsasl2.so.2 (0x0000002a96c97000)
        libssl.so.4 => /lib64/libssl.so.4 (0x0000002a96dae000)
        libcrypto.so.4 => /lib64/libcrypto.so.4 (0x0000002a96eeb000)
        libsvn_fs_fs-1.so.0 => /usr/lib64/libsvn_fs_fs-1.so.0
(0x0000002a9711a000)
        libgssapi_krb5.so.2 => /usr/lib64/libgssapi_krb5.so.2
(0x0000002a97238000)
        libkrb5.so.3 => /usr/lib64/libkrb5.so.3 (0x0000002a9734e000)
        libcom_err.so.2 => /lib64/libcom_err.so.2 (0x0000002a974bf000)
        libk5crypto.so.3 => /usr/lib64/libk5crypto.so.3 (0x0000002a975c2000)
--- 8< ----- snip ----- >8 ---

Removing the 2 calls to "chrpath" allowed the build to continue. As far
as I can tell, the resulting modules are working fine without the
chrpath call. Nico, is chrpath working and necessary for you on x86-64?
Is there a way to tell whether it's necessary before calling it?

Issue 3. I had an unpackaged file during the build process, which was
causing rpmbuild to fail. I worked around this by setting
"_unpackaged_files_terminate_build" to 0, but I don't know enough about
RPM to know how to fix this the right way.

--- 8< ----- snip ----- >8 ---
Checking for unpackaged file(s): /usr/lib/rpm/check-files
/home/toby/rpms/tmp/subversion-1.5.0-19957
error: Installed (but unpackaged) file(s) found:
   /usr/lib64/perl5/5.8.5/x86_64-linux-thread-multi/perllocal.pod
--- 8< ----- snip ----- >8 ---

Issue 4. When installing the RPMs, Apache is restarted twice. No biggie,
but I couldn't figure out why this was happening.

Issue 5. Not an issue with the spec file, but with the Makefile for
building the RPMs:

--- 8< ----- snip ----- >8 ---
cd /home/toby/rpms/sources/subversion-1.5.0-19957/../../rpms/i386; for
oldfile in *19957*; do newfile=`echo ${oldfile} | sed -e
"s/-1.5.0-19957.i386.rpm/-1.5.0-19957.rhel4.i386.rpm/"`; echo Moving
${oldfile} to ${newfile}; mv -f ${oldfile} ${newfile}; done
Moving *19957* to *19957*
mv: cannot stat `*19957*': No such file or directory
make: *** [brand_files] Error 1
--- 8< ----- snip ----- >8 ---

Of course this is because the platform is hardcoded as i386, but since
this is just cleanup stuff after the build has finished it's not a big deal.

Aside from these minor issues, the RPMs are now building for me on
x86-64 (CentOS 4).

toby

Index: packages/rpm/redhat-7.x/apr.patch
===================================================================
--- packages/rpm/redhat-7.x/apr.patch (revision 19962)
+++ packages/rpm/redhat-7.x/apr.patch (working copy)
@@ -6,8 +6,8 @@
  dnl - APR_GSETID added
  dnl - bug in apr_temp_dir_get() fixed

--APR_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
--APU_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
+-APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
+-APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
 +APR_VER_REGEXES=["0\.9\.[4-9] 0\.9\.1[0-9] 1\."]
 +APU_VER_REGEXES=["0\.9\.[4-9] 0\.9\.1[0-9] 1\."]

Index: packages/rpm/redhat-8+/apr.patch
===================================================================
--- packages/rpm/redhat-8+/apr.patch (revision 19962)
+++ packages/rpm/redhat-8+/apr.patch (working copy)
@@ -6,8 +6,8 @@
  dnl - APR_GSETID added
  dnl - bug in apr_temp_dir_get() fixed

--APR_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
--APU_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
+-APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
+-APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
 +APR_VER_REGEXES=["0\.9\.[4-9] 0\.9\.1[0-9] 1\."]
 +APU_VER_REGEXES=["0\.9\.[4-9] 0\.9\.1[0-9] 1\."]

Index: packages/rpm/rhel-3/apr.patch
===================================================================
--- packages/rpm/rhel-3/apr.patch (revision 19962)
+++ packages/rpm/rhel-3/apr.patch (working copy)
@@ -6,8 +6,8 @@
  dnl - APR_GSETID added
  dnl - bug in apr_temp_dir_get() fixed

--APR_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
--APU_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
+-APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
+-APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
 +APR_VER_REGEXES=["0\.9\.[4-9] 0\.9\.1[0-9] 1\."]
 +APU_VER_REGEXES=["0\.9\.[4-9] 0\.9\.1[0-9] 1\."]

Index: packages/rpm/rhel-4/apr.patch
===================================================================
--- packages/rpm/rhel-4/apr.patch (revision 19962)
+++ packages/rpm/rhel-4/apr.patch (working copy)
@@ -6,8 +6,8 @@
  dnl - APR_GSETID added
  dnl - bug in apr_temp_dir_get() fixed

--APR_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
--APU_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
+-APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
+-APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
 +APR_VER_REGEXES=["0\.9\.[4-9] 0\.9\.1[0-9] 1\."]
 +APU_VER_REGEXES=["0\.9\.[4-9] 0\.9\.1[0-9] 1\."]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jun 6 16:57:39 2006

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