On Sat, 22 Sep 2001 16:44:04 -0700
Mo DeJong <supermo@bayarea.net> wrote:
> On Sat, 22 Sep 2001 03:24:42 -0700
> Greg Stein <gstein@lyra.org> wrote:
>
> > Hey all,
> >
> > I've been working with Mo's patch and trying to get this stuff to work. I've
> > got it, but I had to work around a libtool bug to do so.
...
> > Anyways... since I feel this is a bit tweaky, I wanted to post before
> > committing. Especially if anybody knows some fixes for the relink problem.
...
> In the mean time, we have a couple of options:
>
> 1) Disable shared builds.
> 2) Tell users to apply the above patch to the libtool 1.4.2 release.
> 3) Change the INSTALL targets so they do a cd before installing.
>
> Option 3 might be the least painful. The build-outputs.mk file INSTALL
> targets would need to change:
>
> $(INSTALL_MOD_STATIC) subversion/libsvn_delta/libsvn_delta.a $(APACHE_TARGET)/libsvn_delta.a
>
> Would become:
>
> cd subversion/libsvn_delta ; $(INSTALL_MOD_STATIC) libsvn_delta.a $(APACHE_TARGET)/libsvn_delta.a
I decided to take a shot at implementing option #3 since it seems the most simple course
of action. This patch will do a cd to the directory in question before calling libtool to
actually do the install. I have double checked it and this works around the problem
without having to patch libtool or any generated files. The one catch is that this
patch will need to be merged with Greg's other patches by hand since it changes
the same lines.
cheers
Mo DeJong
Index: gen-make.py
===================================================================
--- SVN/text-base/gen-make.py Mon Sep 10 09:49:53 2001
+++ gen-make.py Sun Sep 23 13:29:16 2001
@@ -192,16 +188,17 @@
ofile.write('\ninstall-mods-static: %s\n'
'\t$(MKDIR) %s\n'
- % (string.join(la_tweaked + s_files),
- os.path.join('$(APACHE_TARGET)', '.libs')))
+ % (string.join(la_tweaked + s_files), '$(APACHE_TARGET)'))
for file in la_tweaked:
dirname, fname = os.path.split(file)
base = os.path.splitext(fname)[0]
+ # cd to dirname before install to work around libtool 1.4.2 bug.
ofile.write('\t$(INSTALL_MOD_STATIC) %s %s\n'
- '\t$(INSTALL_MOD_STATIC) %s %s\n'
- % (os.path.join(dirname, '.libs', base + '.a'),
- os.path.join('$(APACHE_TARGET)', '.libs', base + '.a'),
- file,
+ '\tcd %s ; $(INSTALL_MOD_STATIC) %s %s\n'
+ % (os.path.join(dirname, base + '.a'),
+ os.path.join('$(APACHE_TARGET)', base + '.a'),
+ dirname,
+ (base + '.la'),
os.path.join('$(APACHE_TARGET)', base + '.la')))
for file in s_files:
ofile.write('\t$(INSTALL_MOD_STATIC) %s %s\n'
@@ -215,10 +212,13 @@
'\t$(MKDIR) $(%sdir)\n'
% (area, string.join(files), area_var))
for file in files:
- ofile.write('\t$(INSTALL_%s) %s %s\n'
- % (string.upper(area_var), file,
- os.path.join('$(%sdir)' % area_var,
- os.path.basename(file))))
+ # cd to dirname before install to work around libtool 1.4.2 bug.
+ dirname, fname = os.path.split(file)
+ ofile.write('\tcd %s ; $(INSTALL_%s) %s %s\n'
+ % (dirname,
+ string.upper(area_var),
+ fname,
+ os.path.join('$(%sdir)' % area_var, fname)))
ofile.write('\n')
includes, i_errors = _collect_paths(parser.get('includes', 'paths'))
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:42 2006