oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

In krb5-config resolve rpath_flag at build-time

Browse Source
This commit is contained in:
Viktor Dukhovni
2017-03-09 14:54:44 -05:00
committed by Viktor Dukhovni
parent 0259f1c449
commit 31896397d7
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/Makefile.am
View File

@@ -40,7 +40,7 @@ subst = sed -e "s!@PACKAGE\@!$(PACKAGE)!g" \
-e "s!@LIBS\@!$(LIBS)!g" -e "s!@LIBS\@!$(LIBS)!g"
krb5-config: krb5-config.in krb5-config: krb5-config.in
$(subst) $(srcdir)/krb5-config.in > $@.new $(subst) $(srcdir)/krb5-config.in | /bin/sh > $@.new
mv $@.new $@ mv $@.new $@
chmod +x $@ chmod +x $@

10
tools/krb5-config.in
View File

@@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
cat <<'EOM'
#!/bin/sh
# #
# Copyright (c) 2000 - 2008 Kungliga Tekniska Högskolan # Copyright (c) 2000 - 2008 Kungliga Tekniska Högskolan
# (Royal Institute of Technology, Stockholm, Sweden). # (Royal Institute of Technology, Stockholm, Sweden).
@@ -181,6 +184,8 @@ fi
# option... And MIT's krb5-config does include rpath flags. # option... And MIT's krb5-config does include rpath flags.
# #
# Compatibility with MIT is the winning consideration for now. # Compatibility with MIT is the winning consideration for now.
EOM
case "@CANONICAL_HOST@" in case "@CANONICAL_HOST@" in
alpha*-dec-osf*) alpha*-dec-osf*)
rpath_flag='-Wl,-rpath -Wl,';; rpath_flag='-Wl,-rpath -Wl,';;
@@ -198,6 +203,10 @@ alpha*-dec-osf*)
rpath_flag=;; rpath_flag=;;
esac esac
echo "rpath_flag='$rpath_flag'"
cat <<'EOM'
if test "$do_libs" = "yes"; then if test "$do_libs" = "yes"; then
deplibs="" deplibs=""
if test "$lib_gssapi" = yes; then if test "$lib_gssapi" = yes; then
@@ -254,3 +263,4 @@ if test "$do_cflags" = "yes"; then
fi fi
exit 0 exit 0
EOM