From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 16 Jan 2010 13:55:28 +0000 (+0000)
Subject: [packages] krb5: ensure linking against supplied libcom_err (#6508)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=a3d4fe27daa1d295b51a4474ecf79a36fd80800d

[packages] krb5: ensure linking against supplied libcom_err (#6508)


SVN-Revision: 19170
---

diff --git a/net/krb5/Makefile b/net/krb5/Makefile
index d17e1d7444..80ad248104 100644
--- a/net/krb5/Makefile
+++ b/net/krb5/Makefile
@@ -60,6 +60,7 @@ define Build/Prepare
 	tar xzf "$(BUILD_DIR)/krb5-$(PKG_VERSION).tar.gz" -C "$(BUILD_DIR)"
 	patch -p1 -d "$(PKG_BUILD_DIR)" < "$(PATCH_DIR)/001-uclibc-symbol-collision-fix.patch"
 	patch -p1 -d "$(PKG_BUILD_DIR)" < "$(PATCH_DIR)/002-krb5kdc-dir-to-etc.patch"
+	patch -p1 -d "$(PKG_BUILD_DIR)" < "$(PATCH_DIR)/003-krb5kdc-com-err-fix.patch"
 endef
 
 CONFIGURE_PATH = ./src
diff --git a/net/krb5/patches/003-krb5kdc-com-err-fix.patch b/net/krb5/patches/003-krb5kdc-com-err-fix.patch
new file mode 100644
index 0000000000..d068980a1e
--- /dev/null
+++ b/net/krb5/patches/003-krb5kdc-com-err-fix.patch
@@ -0,0 +1,15 @@
+diff -u --recursive krb5-1.7-vanilla/src/config/shlib.conf krb5-1.7/src/config/shlib.conf
+--- krb5-1.7-vanilla/src/config/shlib.conf	2008-12-08 17:33:07.000000000 -0500
++++ krb5-1.7/src/config/shlib.conf	2010-01-15 22:04:16.345151448 -0500
+@@ -409,9 +409,9 @@
+ 	SHLIBEXT=.so
+ 	# Linux ld doesn't default to stuffing the SONAME field...
+ 	# Use objdump -x to examine the fields of the library
+-	LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT),--no-undefined $(LDFLAGS)'
++	LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT),--no-undefined'
+ 	# 
+-	LDCOMBINE_TAIL='-Wl,--version-script binutils.versions && $(PERL) -w $(SRCTOP)/util/export-check.pl $(SHLIB_EXPORT_FILE) $@'
++	LDCOMBINE_TAIL='-Wl,--version-script binutils.versions $(LDFLAGS) && $(PERL) -w $(SRCTOP)/util/export-check.pl $(SHLIB_EXPORT_FILE) $@'
+ 	SHLIB_EXPORT_FILE_DEP=binutils.versions
+ 	# For cases where we do have dependencies on other libraries
+ 	# built in this tree...