use make-rpath to create rpath argument to ld
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10345 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -80,11 +80,11 @@ OBJS = sia.o posix_getpw.o
|
|||||||
|
|
||||||
libsia_krb5.so: $(OBJS)
|
libsia_krb5.so: $(OBJS)
|
||||||
@if test -f $(top_builddir)/lib/krb5/.libs/libkrb5.a; then \
|
@if test -f $(top_builddir)/lib/krb5/.libs/libkrb5.a; then \
|
||||||
echo "$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L) | sed 's,-R,-rpath,g'`"; \
|
echo "$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L)`"; \
|
||||||
$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L) | sed 's,-R,-rpath,g'`; \
|
$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L)`; \
|
||||||
elif test -f $(top_builddir)/lib/krb5/.libs/libkrb5.so; then \
|
elif test -f $(top_builddir)/lib/krb5/.libs/libkrb5.so; then \
|
||||||
echo "$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L_shared) | sed 's,-R,-rpath,g'`"; \
|
echo "$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L_shared)`"; \
|
||||||
$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L_shared) | sed 's,-R,-rpath,g'`; \
|
$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L_shared)`; \
|
||||||
else \
|
else \
|
||||||
echo "missing libraries"; exit 1; \
|
echo "missing libraries"; exit 1; \
|
||||||
fi
|
fi
|
||||||
@@ -92,11 +92,11 @@ libsia_krb5.so: $(OBJS)
|
|||||||
|
|
||||||
libsia_krb4.so: $(OBJS)
|
libsia_krb4.so: $(OBJS)
|
||||||
@if test -f $(top_builddir)/lib/krb/.libs/libkrb.a; then \
|
@if test -f $(top_builddir)/lib/krb/.libs/libkrb.a; then \
|
||||||
echo "$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L) | sed 's,-R,-rpath,g'`"; \
|
echo "$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L)`"; \
|
||||||
$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L) | sed 's,-R,-rpath,g'`; \
|
$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L)`; \
|
||||||
elif test -f $(top_builddir)/lib/krb/.libs/libkrb.so; then \
|
elif test -f $(top_builddir)/lib/krb/.libs/libkrb.so; then \
|
||||||
echo "$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L_shared) | sed 's,-R,-rpath,g'`"; \
|
echo "$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L_shared)`"; \
|
||||||
$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L_shared) | sed 's,-R,-rpath,g'`; \
|
$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L_shared)`; \
|
||||||
else \
|
else \
|
||||||
echo "missing libraries"; exit 1; \
|
echo "missing libraries"; exit 1; \
|
||||||
fi
|
fi
|
||||||
|
34
lib/auth/sia/make-rpath
Executable file
34
lib/auth/sia/make-rpath
Executable file
@@ -0,0 +1,34 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# $Id$
|
||||||
|
rlist=
|
||||||
|
rest=
|
||||||
|
while test $# -gt 0; do
|
||||||
|
case $1 in
|
||||||
|
-R|-rpath)
|
||||||
|
if test "$rlist"; then
|
||||||
|
rlist="${rlist}:$2"
|
||||||
|
else
|
||||||
|
rlist="$2"
|
||||||
|
fi
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
|
-R*)
|
||||||
|
d=`echo $1 | sed 's,^-R,,'`
|
||||||
|
if test "$rlist"; then
|
||||||
|
rlist="${rlist}:${d}"
|
||||||
|
else
|
||||||
|
rlist="${d}"
|
||||||
|
fi
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
rest="${rest} $1"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
rpath=
|
||||||
|
if test "$rlist"; then
|
||||||
|
rpath="-rpath $rlist "
|
||||||
|
fi
|
||||||
|
echo "${rpath}${rest}"
|
Reference in New Issue
Block a user