You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Brandon Ehle <az...@yahoo.com> on 2002/12/31 15:51:47 UTC
Subversion install-swig-pt-ext broken
Here's a patch to fix a regression in the install-swig-py-ext make target.
* Makefile.in: "--prefix=$(DESTDIR)" is a incorrect line in the
install-swig-py-ext statement. The correct behavior is to leave just
the $(DISTUTIL_PARAM) and run "make install-swig-py-ext
DISTUTIL_PARAM=--prefex=$(DESTDIR)" if you want the DESTDIR
functionality (which doesn't make any sense anyway from a python
perspective, the correct behaviour would be to supply the actual
installed python dir. The current behavior breaks homedir installs, RPM
building, and default installs.
Index: Makefile.in
===================================================================
--- Makefile.in (revision 4214)
+++ Makefile.in (working copy)
@@ -313,7 +313,7 @@
install-swig-py-ext: swig-assert-available
cd $(SWIG_BUILD_DIR)/python; \
- $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
--prefix=$(DESTDIR)$(prefix)
+ $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
swig-py-ext-clean:
rm -rf $(SWIG_BUILD_DIR)/python/build
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Subversion install-swig-pt-ext broken
Posted by Blair Zajac <bl...@orcaware.com>.
Brandon Ehle wrote:
>
> Here's a patch to fix a regression in the install-swig-py-ext make target.
>
> * Makefile.in: "--prefix=$(DESTDIR)" is a incorrect line in the
> install-swig-py-ext statement. The correct behavior is to leave just
> the $(DISTUTIL_PARAM) and run "make install-swig-py-ext
> DISTUTIL_PARAM=--prefex=$(DESTDIR)" if you want the DESTDIR
> functionality (which doesn't make any sense anyway from a python
> perspective, the correct behaviour would be to supply the actual
> installed python dir. The current behavior breaks homedir installs, RPM
> building, and default installs.
>
> Index: Makefile.in
> ===================================================================
> --- Makefile.in (revision 4214)
> +++ Makefile.in (working copy)
> @@ -313,7 +313,7 @@
>
> install-swig-py-ext: swig-assert-available
> cd $(SWIG_BUILD_DIR)/python; \
> - $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
> --prefix=$(DESTDIR)$(prefix)
> + $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
>
> swig-py-ext-clean:
> rm -rf $(SWIG_BUILD_DIR)/python/build
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
Brandon,
This was a deliberate commit by Ben Collins, but I noticed
that it broke my Swig bindings also, but I'm a little reluctant to
back it out.
Maybe you and Ben should figure out a way to have this work for
both parties.
% svn diff -r 4190:4191
Index: Makefile.in
===================================================================
--- Makefile.in (revision 4190)
+++ Makefile.in (revision 4191)
@@ -313,7 +313,7 @@
install-swig-py-ext: swig-assert-available
cd $(SWIG_BUILD_DIR)/python; \
- $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
+ $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM) --prefix=$(DESTDIR)$(prefix)
swig-py-ext-clean:
rm -rf $(SWIG_BUILD_DIR)/python/build
% svn log -r 4191
------------------------------------------------------------------------
rev 4191: bcollins | 2002-12-23 10:36:06 -0800 (Mon, 23 Dec 2002) | 3 lines
* Makefile.in: Pass --prefix along with DESTDIR and $prefix to python swig
install path so that it honors DESTDIR (for dists builds).
------------------------------------------------------------------------
Best,
Blair
--
Blair Zajac <bl...@orcaware.com>
Plots of your system's performance - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Subversion install-swig-pt-ext broken
Posted by Brandon Ehle <az...@yahoo.com>.
Ben Collins wrote:
>On Thu, Jan 02, 2003 at 06:45:45PM -0800, Blair Zajac wrote:
>
>
>>Brandon Ehle wrote:
>>
>>
>>>Here's a patch to fix a regression in the install-swig-py-ext make target.
>>>
>>>
>
>Without that patch I could not do DESTDIR= builds for creating local
>Debian packages. I could just copy things by hand, but that defeats the
>whole purpose of supporting DESTDIR.
>
>Question is, does it break because what I did was broken, or because
>your python is incompatible? Is there some more portable method?
>
>
It breaks because your not supposed to assume that Python is installed
as the same directory as DESTDIR. If you want to support DESTDIR like
that, then we are going to need 2 different make targets, one called
"make install-swig-py-ext" for normal users and RPM building, and one
called "make install-swig-py-ext-destdir". The alternative is just to
pass "make install-swig-py-ext DISTUTIL_PARAM=--prefix=some_path" like
you could do before adding the --prefix to the end.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Subversion install-swig-pt-ext broken
Posted by Ben Collins <bc...@debian.org>.
On Thu, Jan 02, 2003 at 06:45:45PM -0800, Blair Zajac wrote:
> Brandon Ehle wrote:
> >
> > Here's a patch to fix a regression in the install-swig-py-ext make target.
Without that patch I could not do DESTDIR= builds for creating local
Debian packages. I could just copy things by hand, but that defeats the
whole purpose of supporting DESTDIR.
Question is, does it break because what I did was broken, or because
your python is incompatible? Is there some more portable method?
--
Debian - http://www.debian.org/
Linux 1394 - http://www.linux1394.org/
Subversion - http://subversion.tigris.org/
Deqo - http://www.deqo.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Subversion install-swig-pt-ext broken
Posted by Blair Zajac <bl...@orcaware.com>.
Brandon Ehle wrote:
>
> Here's a patch to fix a regression in the install-swig-py-ext make target.
>
> * Makefile.in: "--prefix=$(DESTDIR)" is a incorrect line in the
> install-swig-py-ext statement. The correct behavior is to leave just
> the $(DISTUTIL_PARAM) and run "make install-swig-py-ext
> DISTUTIL_PARAM=--prefex=$(DESTDIR)" if you want the DESTDIR
> functionality (which doesn't make any sense anyway from a python
> perspective, the correct behaviour would be to supply the actual
> installed python dir. The current behavior breaks homedir installs, RPM
> building, and default installs.
>
> Index: Makefile.in
> ===================================================================
> --- Makefile.in (revision 4214)
> +++ Makefile.in (working copy)
> @@ -313,7 +313,7 @@
>
> install-swig-py-ext: swig-assert-available
> cd $(SWIG_BUILD_DIR)/python; \
> - $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
> --prefix=$(DESTDIR)$(prefix)
> + $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
>
> swig-py-ext-clean:
> rm -rf $(SWIG_BUILD_DIR)/python/build
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
[With correct email address for Ben this time. It appears that
email to bcollins@tigris.org bounces. Maybe Ben should get an
alias there?]
Brandon,
This was a deliberate commit by Ben Collins, but I noticed
that it broke my Swig bindings also, but I'm a little reluctant to
back it out.
Maybe you and Ben should figure out a way to have this work for
both parties.
% svn diff -r 4190:4191
Index: Makefile.in
===================================================================
--- Makefile.in (revision 4190)
+++ Makefile.in (revision 4191)
@@ -313,7 +313,7 @@
install-swig-py-ext: swig-assert-available
cd $(SWIG_BUILD_DIR)/python; \
- $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
+ $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM) --prefix=$(DESTDIR)$(prefix)
swig-py-ext-clean:
rm -rf $(SWIG_BUILD_DIR)/python/build
% svn log -r 4191
------------------------------------------------------------------------
rev 4191: bcollins | 2002-12-23 10:36:06 -0800 (Mon, 23 Dec 2002) | 3 lines
* Makefile.in: Pass --prefix along with DESTDIR and $prefix to python swig
install path so that it honors DESTDIR (for dists builds).
------------------------------------------------------------------------
Best,
Blair
--
Blair Zajac <bl...@orcaware.com>
Plots of your system's performance - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org