From: Ken Raeburn <raeburn@mit.edu>
Date: Mon, 5 Mar 2007 23:51:22 +0000 (+0000)
Subject: osf1: get proper library dependencies installed
X-Git-Tag: krb5-1.7-alpha1~1266
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86a1cb93d4370dceab9e0960597a1c6c042c2967;p=krb5.git

osf1: get proper library dependencies installed

The LDCOMBINE setting for Tru64 left out $(CFLAGS), which meant the
-pthread option wasn't being passed in, so the libraries didn't
indicate a dependency on the pthread library despite the fact that we
need it unconditionally (if thread support is enabled).  Including
$(CFLAGS) should fix this.

Our own binaries get linked with -pthread anyways, so they build okay,
but other binaries trying to link against or load our libraries could
have problems.

ticket: new
target_version: 1.6.1
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19208 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 3e75b8767..b26566a30 100644
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -58,7 +58,7 @@ alpha*-dec-osf*)
 	# Alpha OSF/1 doesn't need separate PIC objects
 	SHOBJEXT=.o
 	INIT_FINI_PREP=initfini=
-	LDCOMBINE='$(CC) $(PTHREAD_CFLAGS) -shared -Wl,-expect_unresolved -Wl,\* -Wl,-update_registry -Wl,$(BUILDTOP)/so_locations -Wl,-soname -Wl,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -Wl,-hidden -Wl,-input,osf1.exports $$initfini'
+	LDCOMBINE='$(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -shared -Wl,-expect_unresolved -Wl,\* -Wl,-update_registry -Wl,$(BUILDTOP)/so_locations -Wl,-soname -Wl,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -Wl,-hidden -Wl,-input,osf1.exports $$initfini'
 	SHLIB_EXPORT_FILE_DEP=osf1.exports
 	use_linker_init_option=yes
 	use_linker_fini_option=yes