From: Michael Tremer Date: Wed, 22 Apr 2009 20:26:51 +0000 (+0200) Subject: Added patch that removes rpath from readline. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cdd81e3f4846a0f7e9c80cee7b154fb23086f3a;p=ipfire-3.x.git Added patch that removes rpath from readline. --- diff --git a/lfs/readline b/lfs/readline index f887590b5..4f5d51062 100644 --- a/lfs/readline +++ b/lfs/readline @@ -37,7 +37,8 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) \ + $(THISAPP)-shlib-1.patch install : $(OBJECT) @@ -53,6 +54,7 @@ $(objects) : $(OBJECT) : @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-shlib-1.patch #cd $(DIR_APP) && sed -i '/MV.*old/d' Makefile.in #cd $(DIR_APP) && sed -i '/{OLDSUFF}/c:' support/shlib-install cd $(DIR_APP) && \ diff --git a/src/quality-agent/whitelist-rpaths b/src/quality-agent/whitelist-rpaths index 8f1ee8aff..18ec891ec 100644 --- a/src/quality-agent/whitelist-rpaths +++ b/src/quality-agent/whitelist-rpaths @@ -1,5 +1,3 @@ -/lib/libhistory.so.6.0 -/lib/libreadline.so.6.0 /sbin/splashy /usr/bin/cjpeg /usr/bin/lzmadec