threads / patch / 25130

patchremote-helpers: build in platform independent directory

Subject: [PATCH] remote-helpers: build in platform independent directory

## tl;dr

3 messages between Sep 17, 2010 and Sep 17, 2010. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Michael J Gruber· Sep 17, 2010, 16:17 UTC · lore

The build directory which is used by distutils depends on the platform (e.g. build/lib on Fedora 13, build/lib.linux-i686-2.6 on Ubuntu 9.04). But test-lib.sh expects to find the build in build/lib which can cause t5800-remote-helpers.sh to fail early.

Override distutils' choice so that the build is always in build/lib.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 git_remote_helpers/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to git_remote_helpers/Makefile +1 −1

diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile
index 74b05dc..e8172d3 100644
--- a/git_remote_helpers/Makefile
+++ b/git_remote_helpers/Makefile
@@ -26,7 +26,7 @@ PYLIBDIR=$(shell $(PYTHON_PATH) -c \
 	 print 'lib/python%i.%i/site-packages' % sys.version_info[:2]")
 
 all: $(pysetupfile)
-	$(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
+	$(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build --build-purelib=build/lib --build-platlib=build/lib
 
 install: $(pysetupfile)
 	$(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix)

-- 
1.7.3.rc2.221.gbf93f

Sverre Rabbelier· Sep 17, 2010, 16:31 UTC · re: Michael J Gruber · lore

Re: [PATCH] remote-helpers: build in platform independent directory

Heya,

[+Jonathan]

On Fri, Sep 17, 2010 at 18:17, Michael J Gruber <git@drmicha.warpmail.net> wrote:

Show 25 quoted lines

> The build directory which is used by distutils depends on the platform
> (e.g. build/lib on Fedora 13, build/lib.linux-i686-2.6 on Ubuntu 9.04).
> But test-lib.sh expects to find the build in build/lib which can cause
> t5800-remote-helpers.sh to fail early.
>
> Override distutils' choice so that the build is always in build/lib.
>
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---
>  git_remote_helpers/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile
> index 74b05dc..e8172d3 100644
> --- a/git_remote_helpers/Makefile
> +++ b/git_remote_helpers/Makefile
> @@ -26,7 +26,7 @@ PYLIBDIR=$(shell $(PYTHON_PATH) -c \
>         print 'lib/python%i.%i/site-packages' % sys.version_info[:2]")
>
>  all: $(pysetupfile)
> -       $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
> +       $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build --build-purelib=build/lib --build-platlib=build/lib
>
>  install: $(pysetupfile)
>        $(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix)

I don't know if this works on all platforms etc, Jonathan?

-- 
Cheers,

Sverre Rabbelier

Junio C Hamano· Sep 17, 2010, 18:41 UTC · re: Michael J Gruber · lore

Re: [PATCH] remote-helpers: build in platform independent directory

Michael J Gruber <git@drmicha.warpmail.net> writes:

Show 25 quoted lines

> The build directory which is used by distutils depends on the platform
> (e.g. build/lib on Fedora 13, build/lib.linux-i686-2.6 on Ubuntu 9.04).
> But test-lib.sh expects to find the build in build/lib which can cause
> t5800-remote-helpers.sh to fail early.
>
> Override distutils' choice so that the build is always in build/lib.
>
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---
>  git_remote_helpers/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile
> index 74b05dc..e8172d3 100644
> --- a/git_remote_helpers/Makefile
> +++ b/git_remote_helpers/Makefile
> @@ -26,7 +26,7 @@ PYLIBDIR=$(shell $(PYTHON_PATH) -c \
>  	 print 'lib/python%i.%i/site-packages' % sys.version_info[:2]")
>  
>  all: $(pysetupfile)
> -	$(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
> +	$(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build --build-purelib=build/lib --build-platlib=build/lib
>  
>  install: $(pysetupfile)
>  	$(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix)

Hmm, wouldn't this interfere with the install target if you do not tell the "setup.py install" where your built stuff lives?