diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-02-20 07:37:45 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-02-20 07:37:45 +0000 |
| commit | cad0762cfafd1a9db210d1ace247b2f396fdedaa (patch) | |
| tree | 6058b6b5378c8e84ef4c301946fd4e8419e7232d /net-nds/openldap/files | |
| parent | Bump for #404565 (diff) | |
| download | gentoo-2-cad0762cfafd1a9db210d1ace247b2f396fdedaa.tar.gz gentoo-2-cad0762cfafd1a9db210d1ace247b2f396fdedaa.tar.bz2 gentoo-2-cad0762cfafd1a9db210d1ace247b2f396fdedaa.zip | |
Fix libtool build failure when /bin/sh points to dash. Approved by robbat2.
(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)
Diffstat (limited to 'net-nds/openldap/files')
| -rw-r--r-- | net-nds/openldap/files/openldap-2.4.28-fix-dash.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch b/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch new file mode 100644 index 000000000000..d15c3d2231f4 --- /dev/null +++ b/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch @@ -0,0 +1,26 @@ +Our libtool needs bash to work properly. +Patch unbreaks build when /bin/sh points to dash: + + Entering subdirectory liblber + /bin/sh ../../libtool --mode=compile x86_64-pc-linux-gnu-gcc -O0 -D_GNU_SOURCE -I../../include -I../../include -I/usr/include/db4.8 -DLDAP_CONNECTIONLESS -DLBER_LIBRARY -c assert.c + ../../build/mkversion -v "2.4.28" liblber.la > version.c + /bin/sh ../../libtool --mode=compile x86_64-pc-linux-gnu-gcc -O0 -D_GNU_SOURCE -I../../include -I../../include -I/usr/include/db4.8 -DLDAP_CONNECTIONLESS -DLBER_LIBRARY -c decode.c + eval: 1: base_compile+= x86_64-pc-linux-gnu-gcc: not found + eval: 1: base_compile+= -O0: not found + eval: 1: base_compile+= -D_GNU_SOURCE: not found + eval: 1: base_compile+= x86_64-pc-linux-gnu-gcc: not found + ... + make[2]: *** [decode.lo] Error 1 +diff --git a/build/top.mk b/build/top.mk +index 6fea488..ea324e3 100644 +--- a/build/top.mk ++++ b/build/top.mk +@@ -20,7 +20,7 @@ VERSION= @VERSION@ + RELEASEDATE= @OPENLDAP_RELEASE_DATE@ + + @SET_MAKE@ +-SHELL = /bin/sh ++SHELL = @SHELL@ + + top_builddir = @top_builddir@ + |