From f884dd77f901d534a32c766a9f23b1ab7c466cdb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 25 Sep 2007 13:08:04 +0000 Subject: [PATCH] Nicer libtool/g++ hack (was collision with . in PATH). --- org.glite.security.gsoap-plugin/Makefile | 8 ++------ org.glite.security.gsoap-plugin/project/libtoolhack/gcc | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 org.glite.security.gsoap-plugin/project/libtoolhack/gcc diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile index c8b0abb..e04790d 100644 --- a/org.glite.security.gsoap-plugin/Makefile +++ b/org.glite.security.gsoap-plugin/Makefile @@ -71,7 +71,7 @@ LDFLAGS:=${COVERAGE_FLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} COMPILEXX:=libtool --mode=compile ${CXX} ${CFLAGS} LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} -LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} +LINKXX:=PATH=${top_srcdir}/project/libtoolhack:${PATH} libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} INSTALL:=libtool --mode=install install GLOBUS_INC:= -I${globus_prefix}/include/${nothrflavour} @@ -167,15 +167,11 @@ ${LTLIB_S}: ${OBJS_S} ${THRLTLIB_S}: ${THROBJS_S} PATH=${top_builddir}:${PATH} ${LINKXX} ${version_info} -o $@ ${THRLOBJS_S} ${EX_THRLIBS} -all compile: libtool-hack \ +all compile: \ ${GSS_STATICLIB} ${GSS_LTLIB} ${GSS_THRSTATICLIB} ${GSS_THRLTLIB} \ ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB} \ all-libs-with-soap examples -libtool-hack: - echo 'g++ $$@' > gcc - chmod +x gcc - check: compile check.gss check.gss: test_gss diff --git a/org.glite.security.gsoap-plugin/project/libtoolhack/gcc b/org.glite.security.gsoap-plugin/project/libtoolhack/gcc new file mode 100644 index 0000000..32933cd --- /dev/null +++ b/org.glite.security.gsoap-plugin/project/libtoolhack/gcc @@ -0,0 +1 @@ +g++ "$@" -- 1.8.2.3