Re: [PATCH] "test" in Solaris' /bin/sh does not support -e

Dennis Stosberg [off-list ref] writes:

Argh!  Why don't they put their "standards compliant" shell to
/bin/sh?  The current one doesn't even support the $( )-style command
substitution, so making the scripts run with that shell would be
_really_ ugly.

Which means this in pb/gitpm topic needs further changes,
perhaps.

$ git grep -n '\$\$(' pb/gitpm:Makefile
pb/gitpm:Makefile:537:	INSTLIBDIR=$$(make -s -C perl instlibdir) && \

Solaris' /bin/sh does not support $( )-style command substitution

Signed-off-by: Dennis Stosberg <redacted>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index a326f6e..f44fbd3 100644
--- a/Makefile
+++ b/Makefile

@@ -544,7 +544,7 @@ common-cmds.h: Documentation/git-*.txt
 $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/Makefile
 $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
 	rm -f $@ $@+
-	INSTLIBDIR=$$(make -s -C perl instlibdir) && \
+	INSTLIBDIR=`make -s -C perl instlibdir` && \
 	sed -e '1s|#!.*perl\(.*\)|#!$(PERL_PATH_SQ)\1|' \
 	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
 	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \

-- 
1.4.1.rc1.g80bff-dirty

Signed-off-by: Dennis Stosberg <redacted>
---
 Makefile |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f44fbd3..306025d 100644
--- a/Makefile
+++ b/Makefile

@@ -94,6 +94,8 @@ CFLAGS = -g -O2 -Wall
 LDFLAGS =
 ALL_CFLAGS = $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
+PERL_CFLAGS =
+PERL_LDFLAGS =
 STRIP ?= strip
 
 prefix = $(HOME)

@@ -119,8 +121,8 @@ ### --- END CONFIGURATION SECTION ---
 
 # Those must not be GNU-specific; they are shared with perl/ which may
 # be built by a different compiler.
-BASIC_CFLAGS =
-BASIC_LDFLAGS =
+BASIC_CFLAGS = $(PERL_CFLAGS)
+BASIC_LDFLAGS = $(PERL_LDFLAGS)
 
 SCRIPT_SH = \
 	git-bisect.sh git-branch.sh git-checkout.sh \

-- 
1.4.1.rc1.g80bff-dirty

Junio C Hamano wrote:

Which means this in pb/gitpm topic needs further changes,
perhaps.

Indeed.

The second patch makes it possible to give additional CFLAGS and
LDFLAGS for compiling the perl module.  Otherwise the compiler may
not be able to find headers and libraries for curl, expat and
openssl.  This is needed on Solaris where these libraries will
usually be in paths like /usr/local or /opt/gnu.

With the patch Pasky started this thread with, the four patches I
sent earlier and these last two patches the pu branch compiles,
tests and installs cleanly on Solaris 9, both with Sun CC 5.8 and
GCC 4.1.1.

Regards,
Dennis

Dear diary, on Tue, Jun 27, 2006 at 12:23:08AM CEST, I got a letter
where Dennis Stosberg [off-list ref] said that...

Just an annotation:

	ALL_* means "use these flags for compilation of all the stuff
			except perly stuff"
	PERL_* means "use these flags for compilation of really all the
			stuff"

So "all" might not mean what you think and Perl is stonger than
everything.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Snow falling on Perl. White noise covering line noise.
Hides all the bugs too. -- J. Putnam