Added patch that removes rpath from readline.

diff --git a/lfs/readline b/lfs/readline
index f887590b53cb29790a0c67710e234d9ae6ffa36a..4f5d510620fad3c164ffc9e03640d8f18391c68f 100644 (file)
--- 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 8f1ee8aff4dc059637c25a83b06c04c7b2181367..18ec891ecde571b7352778769787d872be8273ed 100644 (file)
--- 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