Remove hard-coded RPATH flags from patch and use PKGCONFIG_OVERRIDE instead.

Fixes unwanted linker flags for platforms missing rpath support.

3 files changed, 16 insertions, 17 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index cc994b2655a..a5498b45029 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2014/06/08 08:32:10 obache Exp $
+# $NetBSD: Makefile,v 1.91 2014/06/08 09:08:19 obache Exp $
 
 DISTNAME=	icu4c-53_1-src
 PKGNAME=	${DISTNAME:S/4c//:S/-src//:S/_/./g}
@@ -89,6 +89,14 @@ PLIST_SUBST+=		MH_NAME=mh-unknown
 INSTALL_UNSTRIPPED=	yes
 .endif
 
+PKGCONFIG_OVERRIDE+=	config/icu-i18n.pc
+PKGCONFIG_OVERRIDE+=	config/icu-io.pc
+PKGCONFIG_OVERRIDE+=	config/icu-le.pc
+PKGCONFIG_OVERRIDE+=	config/icu-lx.pc
+PKGCONFIG_OVERRIDE+=	config/icu-uc.pc
+PKGCONFIG_OVERRIDE+=	config/icu.pc
+PKGCONFIG_OVERRIDE_STAGE=	post-build
+
 # expect builtin gcc atomic functions for gcc>=4.1
 # (source/common/putilimp.h)
 .if !empty(CC_VERSION:Mgcc-*) &&	\
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index be7afc9f1a3..5d10aa21310 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.47 2014/06/08 08:32:10 obache Exp $
+$NetBSD: distinfo,v 1.48 2014/06/08 09:08:19 obache Exp $
 
 SHA1 (icu4c-53_1-src.tgz) = 7eca017fdd101e676d425caaf28ef862d3655e0f
 RMD160 (icu4c-53_1-src.tgz) = 9bd1b4bdc2010545c76a927dcf46049686beeab9
 Size (icu4c-53_1-src.tgz) = 23218952 bytes
-SHA1 (patch-aa) = fcbebb03f4a48294faeebd600fee989cab351230
+SHA1 (patch-aa) = dc4adcbd6e3115b0f58c7452f408fcab2dd77f45
 SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
 SHA1 (patch-acinclude.m4) = 40ddfb09cbc951928296c35e8a4303cf7fbe7e17
diff --git a/textproc/icu/patches/patch-aa b/textproc/icu/patches/patch-aa
index 348acdff270..153a3a794d6 100644
--- a/textproc/icu/patches/patch-aa
+++ b/textproc/icu/patches/patch-aa
@@ -1,25 +1,16 @@
-$NetBSD: patch-aa,v 1.15 2012/11/07 20:59:51 adam Exp $
+$NetBSD: patch-aa,v 1.16 2014/06/08 09:08:20 obache Exp $
 
 Add linker flags for finding the libraries to pkg-config files.
 Avoid using programs which need elevated privileges during the build.
 
 --- Makefile.in.orig	2012-11-05 17:18:12.000000000 +0000
 +++ Makefile.in
-@@ -247,7 +247,7 @@ config/icu-uc.pc: config/icu.pc Makefile
- 	@cat config/icu.pc > $@
- 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Common and Data libraries" >> $@
- 	@echo "Name: $(PACKAGE)-uc" >> $@
--	@echo "Libs:" '-L$${libdir}' "${ICULIBS_UC}" "${ICULIBS_DT}" >> $@
-+	@echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_UC}" "${ICULIBS_DT}" >> $@
- 	@echo "Libs.private:" '$${baselibs}' >> $@
- 	@echo $@ updated.
- 
 @@ -256,7 +256,7 @@ config/icu-i18n.pc: config/icu.pc Makefi
  	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Internationalization library" >> $@
  	@echo "Name: $(PACKAGE)-i18n" >> $@
  	@echo "Requires: icu-uc" >> $@
 -	@echo "Libs:" "${ICULIBS_I18N}" >> $@
-+	@echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_I18N}" >> $@
++	@echo "Libs:" '-L$${libdir}' "${ICULIBS_I18N}" >> $@
  	@echo $@ updated.
  
  config/icu-io.pc: config/icu.pc Makefile icudefs.mk
@@ -28,7 +19,7 @@ Avoid using programs which need elevated privileges during the build.
  	@echo "Name: $(PACKAGE)-io" >> $@
  	@echo "Requires: icu-i18n" >> $@
 -	@echo "Libs:" "${ICULIBS_IO}" >> $@
-+	@echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_IO}" >> $@
++	@echo "Libs:" '-L$${libdir}' "${ICULIBS_IO}" >> $@
  	@echo $@ updated.
  
  config/icu-le.pc: config/icu.pc Makefile icudefs.mk
@@ -37,7 +28,7 @@ Avoid using programs which need elevated privileges during the build.
  	@echo "Name: $(PACKAGE)-le" >> $@
  	@echo "Requires: icu-uc" >> $@
 -	@echo "Libs:" "${ICULIBS_LE}" >> $@
-+	@echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_LE}" >> $@
++	@echo "Libs:" '-L$${libdir}' "${ICULIBS_LE}" >> $@
  	@echo $@ updated.
  
  config/icu-lx.pc: config/icu.pc Makefile icudefs.mk
@@ -46,7 +37,7 @@ Avoid using programs which need elevated privileges during the build.
  	@echo "Name: $(PACKAGE)-lx" >> $@
  	@echo "Requires: icu-le" >> $@
 -	@echo "Libs:" "${ICULIBS_LX}" >> $@
-+	@echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_LX}" >> $@
++	@echo "Libs:" '-L$${libdir}' "${ICULIBS_LX}" >> $@
  	@echo $@ updated.