You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Jon Middleton <jj...@ixtab.org.uk> on 2002/07/29 20:13:43 UTC
Creating Packages of subversion
Hello,
Over the weekend I created an updated Debian package of subversion and
came across some problems with getting the build system to install
into the temporary area that is used to create the package.
It would help anyone that creating a package if it was possible to
invoke make install as
make install DESTDIR=debian/tmp
So we can direct the install into this package build area instead of
the path set by --prefix option to ./configure.
The direct use of apxs2 to install mod_dav_svn.so into the apache
modules directory is also a problem. If it could be made to use
$(DESTDIR)$(path from apxs2 -q LIBEXECDIR) instead of apxs2 -i -a it
would be of great help to anyone creating ether debs or rpms [1].
I'm currenly looking into creating a patch to gen-make.py that will
have the same effect as the attached patch to build-outs.mk - would the
subversion developers accept such an patch to the build system ?
--
Jon
"First things first -- but not necessarily in that order"
-- The Doctor, "Doctor Who"
[1] There's a patch in the rpm package directory that changes the
apache module install line of build-outs.mk
http://svn.collab.net/repos/svn/tags/0.14.0/packages/rpm/install.patch
RapidSVN project has moved to Tigris
Posted by "Brent R. Matzelle" <bm...@yahoo.com>.
Greetings Everyone,
The RapidSVN project, once located on SourceForge.net has now moved
to Tigris. Please re-direct your links to the new URL:
http://rapidsvn.tigris.org/
Brent
__________________________________________________
Do You Yahoo!?
Yahoo! Health - Feel better, live better
http://health.yahoo.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Creating Packages of subversion
Posted by David Summers <da...@summersoft.fay.ar.us>.
On Wed, 31 Jul 2002, David Kimdon wrote:
> Tue, Jul 30, 2002 at 12:02:36AM -0700 wrote:
> > Tue, Jul 30, 2002 at 12:29:00AM +0100 wrote:
> > > On Mon, Jul 29, 2002 at 03:57:43PM -0700, David Kimdon wrote:
> > > > Mon, Jul 29, 2002 at 09:13:43PM +0100 wrote:
> > > > It isn't obvious to me what we get with the proposed DESTDIR fix that
> > > > we don't have with a prefix override, for example:
> > >
> > > As I say above it does seem to fix the problem with lintool with
> > > relinking.
> > >
> >
> > Cool, got it. I've applied your patch to the current 0.14.0 .debs,
> > much cleaner solution that the libtool hack. The source for
>
> FWIW, I spoke too soon. Even with the DESTDIR patch the libtool
> install phase fails during the package build if there are no
> subversion libraries already installed on the system.
>
This may be the same thing I'm seeing when I build my RPMs and is the
reason for all the -L hacks in the subversion.spec file.
I would love to get rid of those hacks somehow.
:-)
--
David Wayne Summers "Linux: Because reboots are for upgrades!"
david@summersoft.fay.ar.us PGP Key: http://summersoft.fay.ar.us/~david/pgp.txt
PGP Key fingerprint = C0 E0 4F 50 DD A9 B6 2B 60 A1 31 7E D2 28 6D A8
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Creating Packages of subversion
Posted by David Kimdon <dw...@debian.org>.
Tue, Jul 30, 2002 at 12:02:36AM -0700 wrote:
> Tue, Jul 30, 2002 at 12:29:00AM +0100 wrote:
> > On Mon, Jul 29, 2002 at 03:57:43PM -0700, David Kimdon wrote:
> > > Mon, Jul 29, 2002 at 09:13:43PM +0100 wrote:
> > > It isn't obvious to me what we get with the proposed DESTDIR fix that
> > > we don't have with a prefix override, for example:
> >
> > As I say above it does seem to fix the problem with lintool with
> > relinking.
> >
>
> Cool, got it. I've applied your patch to the current 0.14.0 .debs,
> much cleaner solution that the libtool hack. The source for
FWIW, I spoke too soon. Even with the DESTDIR patch the libtool
install phase fails during the package build if there are no
subversion libraries already installed on the system.
-David
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Creating Packages of subversion
Posted by David Kimdon <dw...@debian.org>.
Tue, Jul 30, 2002 at 12:29:00AM +0100 wrote:
> On Mon, Jul 29, 2002 at 03:57:43PM -0700, David Kimdon wrote:
> > Mon, Jul 29, 2002 at 09:13:43PM +0100 wrote:
> > It isn't obvious to me what we get with the proposed DESTDIR fix that
> > we don't have with a prefix override, for example:
>
> As I say above it does seem to fix the problem with lintool with
> relinking.
>
Cool, got it. I've applied your patch to the current 0.14.0 .debs,
much cleaner solution that the libtool hack. The source for
pre-release 0.14.0 subversion debs is at
http://people.debian.org/~dwhedon/debian/, FWIW. apache2 is shaping up
as well and hopefully we'll get that an subversion updated into Debian
soon.
-David
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Creating Packages of subversion
Posted by Jon Middleton <jj...@ixtab.org.uk>.
On Mon, Jul 29, 2002 at 03:57:43PM -0700, David Kimdon wrote:
> Mon, Jul 29, 2002 at 09:13:43PM +0100 wrote:
> > Hello,
> >
> > It would help anyone that creating a package if it was possible to
> > invoke make install as
> >
> > make install DESTDIR=debian/tmp
>
> This is due to a bug in libtool:
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=98342&repeatmerged=yes
>
> Have a look at the current debian packages in debian/patches/ltmain.sh.diff
> for a fix. You should apply the patch after running autogen.sh.
If we pass DESTDIR to make install this patch is not needed as we are
not changing $(prefix) which does not cause any problems while
relinking (I currently using packages built without this patch -
basied on your 13.2 packages from people.debian.org. I'll forward a
patch off list)
> It would be nice to teach apxs2 to play better with packaging, I
> agree. One option is to make some changes to apxs2 that would allow
> this type of operation. I haven't looked into it in detail but is
> seams to me the fix should go in apxs2 since that would benefit a
> larger audience.
It turns out that it is possible, see my other mail with the patch
that implements this proposal.
> It isn't obvious to me what we get with the proposed DESTDIR fix that
> we don't have with a prefix override, for example:
As I say above it does seem to fix the problem with lintool with
relinking.
--
Jon
"First things first -- but not necessarily in that order"
-- The Doctor, "Doctor Who"
Re: Creating Packages of subversion
Posted by David Kimdon <dw...@debian.org>.
Mon, Jul 29, 2002 at 09:13:43PM +0100 wrote:
> Hello,
>
> Over the weekend I created an updated Debian package of subversion and
> came across some problems with getting the build system to install
> into the temporary area that is used to create the package.
Cool, I guess I haven't been quick enough getting 0.14.0 out. If you
want to help coordinate, hack, etc. that's great. At present
we're waiting on getting new apache2 .debs into the archive. I have
0.14.0 mostly ready, and it does pass the testsuite with apr 2.0.37
but I'd rather wait until we have a more recent apr (Thom May is
working on 2.0.40-pre or some such) in the archive to avoid subtle
bugs.
> It would help anyone that creating a package if it was possible to
> invoke make install as
>
> make install DESTDIR=debian/tmp
This is due to a bug in libtool:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=98342&repeatmerged=yes
Have a look at the current debian packages in debian/patches/ltmain.sh.diff
for a fix. You should apply the patch after running autogen.sh.
> The direct use of apxs2 to install mod_dav_svn.so into the apache
> modules directory is also a problem. If it could be made to use
> $(DESTDIR)$(path from apxs2 -q LIBEXECDIR) instead of apxs2 -i -a it
> would be of great help to anyone creating ether debs or rpms [1].
It would be nice to teach apxs2 to play better with packaging, I
agree. One option is to make some changes to apxs2 that would allow
this type of operation. I haven't looked into it in detail but is
seams to me the fix should go in apxs2 since that would benefit a
larger audience.
>
> I'm currenly looking into creating a patch to gen-make.py that will
> have the same effect as the attached patch to build-outs.mk - would the
> subversion developers accept such an patch to the build system ?
>
It isn't obvious to me what we get with the proposed DESTDIR fix that
we don't have with a prefix override, for example:
$(MAKE) install prefix=$(INSTALL_PREFIX) -C build-svn
Hmm, that's all for now,
-David
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Add support for make install DESTDIR=
Posted by Jon Middleton <jj...@ixtab.org.uk>.
On Fri, Aug 02, 2002 at 10:19:56PM +0200, Arkadiusz Miskiewicz wrote:
> Jon Middleton <jj...@ixtab.org.uk> writes:
> >
> > The attched patch adds support for installing subversion into a
> > different directory by adding DESTDIR to make install. Most of the
> > patch is just adding $(DESTDIR) into the install paths.
> I don't know why these DESTDIR patches are not applied. Even
> without this...
There are some problems with the original patch. I've attached a
updated version but it only works if subversion is already installed
(David Kimdon reports that this is caused by a bug in libtool).
> apxs is afaik still broken when httpd.conf is *directory* not file.
> (ability to) disable it is good thing (tm) IMO.
I've posted a updated version of this patch already tonight, and it
works with the package builds I've done tonight.
--
Jon
"First things first -- but not necessarily in that order"
-- The Doctor, "Doctor Who"
Re: [PATCH] Add support for make install DESTDIR=
Posted by Arkadiusz Miskiewicz <mi...@pld.ORG.PL>.
Jon Middleton <jj...@ixtab.org.uk> writes:
> On Mon, Jul 29, 2002 at 09:13:43PM +0100, Jon Middleton wrote:
> > Hello,
> >
> > Over the weekend I created an updated Debian package of subversion and
> > came across some problems with getting the build system to install
> > into the temporary area that is used to create the package.
> >
> > It would help anyone that creating a package if it was possible to
> > invoke make install as
> >
> > make install DESTDIR=debian/tmp
>
> The attched patch adds support for installing subversion into a
> different directory by adding DESTDIR to make install. Most of the
> patch is just adding $(DESTDIR) into the install paths.
I don't know why these DESTDIR patches are not applied. Even
without this...
> The largest change is to how axsp2 is called, I've added -S
> LIBEXECDIR=$(DESTDIR)$(APACHE_LIBEXECDIR) to install-mods-shared: and
> removed -a so that it doesn't try to modify httpd.conf, which is
> not in the modified path.
... change instead of having packages/rpm/install.patch
and using in packages/rpm/subversion.spec this ugly make install
rule:
make install \
prefix=$RPM_BUILD_ROOT/usr \
mandir=$RPM_BUILD_ROOT/usr/share/man \
fs_libdir=$RPM_BUILD_ROOT/usr/lib \
base_libdir=$RPM_BUILD_ROOT/usr/lib \
infodir=$RPM_BUILD_ROOT/usr/share/info \
libexecdir=$RPM_BUILD_ROOT/%{apache_dir}/lib
you could use in spec:
make install \
INSTALL_MOD_SHARED=echo \
DESTDIR=$RPM_BUILD_ROOT
install subversion/mod_dav_svn/.libs/*.so $RPM_BUILD_ROOT%{_apachelibdir}
much simpler, no need to patch anything.
> I'm currently thinking that the changes to axsp2 should be done as an
> option to configure (--enable-package-mode or --disable-mod-activate ?)
> to allow packagers to disable this activation.
>
> I'll have a look at doing this change tomorrow night if people think
> it's a worthy addition.
apxs is afaik still broken when httpd.conf is *directory* not file.
[root@arm misiek]# ls /etc/httpd/httpd.conf/
10_httpd.conf 50_mod_actions.conf 60_mod_expires.conf 65_mod_usertrack.conf
10_httpd.conf.rpmnew 51_mod_auth.conf 62_mod_headers.conf 66_mod_unique_id.conf
20_mod_vhost_alias.conf 59_mod_dir.conf 65_mod_dav_svn.conf 70_mod_php.conf
45_mod_dav.conf 59_mod_dir.conf.rpmnew 65_mod_dav_svn.conf.rpmnew
(ability to) disable it is good thing (tm) IMO.
> Jon
--
Arkadiusz Miśkiewicz IPv6 ready PLD Linux at http://www.pld.org.pl
misiek(at)pld.org.pl AM2-6BONE, 1024/3DB19BBD, arekm(at)ircnet, PWr
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Add support for make install DESTDIR=
Posted by Jon Middleton <jj...@ixtab.org.uk>.
On Mon, Jul 29, 2002 at 11:20:39PM -0400, Kevin Pilch-Bisson wrote:
> On Mon, Jul 29, 2002 at 06:21:35PM -0500, Scott Lamb wrote:
> > Jon Middleton wrote:
> > >I'm currently thinking that the changes to axsp2 should be done as an
> > >option to configure (--enable-package-mode or --disable-mod-activate ?)
> > >to allow packagers to disable this activation.
> > >
> > >I'll have a look at doing this change tomorrow night if people think
> > >it's a worthy addition.
> >
> > Yeah, that always bugs me (my httpd.conf loses a tab when it activates
> > the module, so "svn status" shows it as modified after a "make install")
> > but I've never bothered to change it. That's a reason to use it when not
> > packaging, so maybe --disable-mod-activate is better.
>
> You're not the only one who would like to see --disable-mod-activate.
> I'd definitely be in favour of creating that option, and of seeing
> DESTDIR support in gen_base.py. In fact I have almost the exact same
> patch already in my local tree. The only reason I haven't committed
> yet, is that I get errors when installing mod_dav_svn.so, since
> $(DESTDIR)/usr/local/apache2/modules doesn't actually exist, so
> inst_dso.sh can't copy it there. If you have a work around for that
> problem, I'll commit your patch.
It work round this problem by adding a call to
$(MKDIR) $(DESTDIR)$(APACHE_LIBEXECDIR)
from install-mod-shared so that the directory is created before
calling apxs2. I've attached a patch which only touch's
build/gen_base.py and does remove -a option from apxs2 Makefile.in as
I'm going to start adding
--enable-mod-activation
--disale-mod-activation
To configure to night when I get back from work (I think activation is
a beter word to use than activate).
--
Jon
"First things first -- but not necessarily in that order"
-- The Doctor, "Doctor Who"
Re: [PATCH] Add support for make install DESTDIR=
Posted by Kevin Pilch-Bisson <ke...@pilch-bisson.net>.
On Mon, Jul 29, 2002 at 06:21:35PM -0500, Scott Lamb wrote:
> Jon Middleton wrote:
> >I'm currently thinking that the changes to axsp2 should be done as an
> >option to configure (--enable-package-mode or --disable-mod-activate ?)
> >to allow packagers to disable this activation.
> >
> >I'll have a look at doing this change tomorrow night if people think
> >it's a worthy addition.
>
> Yeah, that always bugs me (my httpd.conf loses a tab when it activates
> the module, so "svn status" shows it as modified after a "make install")
> but I've never bothered to change it. That's a reason to use it when not
> packaging, so maybe --disable-mod-activate is better.
You're not the only one who would like to see --disable-mod-activate.
I'd definitely be in favour of creating that option, and of seeing
DESTDIR support in gen_base.py. In fact I have almost the exact same
patch already in my local tree. The only reason I haven't committed
yet, is that I get errors when installing mod_dav_svn.so, since
$(DESTDIR)/usr/local/apache2/modules doesn't actually exist, so
inst_dso.sh can't copy it there. If you have a work around for that
problem, I'll commit your patch.
>
> Scott
>
>
--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kevin Pilch-Bisson http://www.pilch-bisson.net
"Historically speaking, the presences of wheels in Unix
has never precluded their reinvention." - Larry Wall
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Re: [PATCH] Add support for make install DESTDIR=
Posted by Scott Lamb <sl...@slamb.org>.
Jon Middleton wrote:
> I'm currently thinking that the changes to axsp2 should be done as an
> option to configure (--enable-package-mode or --disable-mod-activate ?)
> to allow packagers to disable this activation.
>
> I'll have a look at doing this change tomorrow night if people think
> it's a worthy addition.
Yeah, that always bugs me (my httpd.conf loses a tab when it activates
the module, so "svn status" shows it as modified after a "make install")
but I've never bothered to change it. That's a reason to use it when not
packaging, so maybe --disable-mod-activate is better.
Scott
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
[PATCH] Add support for make install DESTDIR=
Posted by Jon Middleton <jj...@ixtab.org.uk>.
On Mon, Jul 29, 2002 at 09:13:43PM +0100, Jon Middleton wrote:
> Hello,
>
> Over the weekend I created an updated Debian package of subversion and
> came across some problems with getting the build system to install
> into the temporary area that is used to create the package.
>
> It would help anyone that creating a package if it was possible to
> invoke make install as
>
> make install DESTDIR=debian/tmp
The attched patch adds support for installing subversion into a
different directory by adding DESTDIR to make install. Most of the
patch is just adding $(DESTDIR) into the install paths.
The largest change is to how axsp2 is called, I've added -S
LIBEXECDIR=$(DESTDIR)$(APACHE_LIBEXECDIR) to install-mods-shared: and
removed -a so that it doesn't try to modify httpd.conf, which is
not in the modified path.
I'm currently thinking that the changes to axsp2 should be done as an
option to configure (--enable-package-mode or --disable-mod-activate ?)
to allow packagers to disable this activation.
I'll have a look at doing this change tomorrow night if people think
it's a worthy addition.
--
Jon
"First things first -- but not necessarily in that order"
-- The Doctor, "Doctor Who"