Skip to content
  • John Johansen's avatar
    libapparmor: Finish removing LD_RUN_PATH from Makefile.perl · a1ca25db
    John Johansen authored
    commit 94dfe15b attempted to remove
    LD_RUN_PATH unfortunately
    
       But all it actually does is cause the Makefile.perl to embed the rpath
        "" instead. Which is still an rpath, only I guess an even worse one.
    
        --
        Eli Schwartz
        Arch Linux Bug Wrangler and Trusted User
    
    This is because it cleared the setting of the variable LD_RUN_PATH
    which was expanded in the command
    
    $(INST_DYNAMIC) : $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPORT_LIST) $(PERL_ARCHIVEDEP) $(PERL_ARCHIVE_AFTER) $(INST_DYNAMIC_DEP)
    	$(RM_F) $@
    	 LD_RUN_PATH="$(LD_RUN_PATH)" $(LD)  $(LDDLFLAGS) $(LDFROM) $(OTHERLDFLAGS) -o $@ $(MYEXTLIB) \
    	  $(PERL_ARCHIVE) $(LDLOADLIBS) $(PERL_ARCHIVE_AFTER) $(EXPORT_LIST) \
    	  $(INST_DYNAMIC_FIX)
    	$(CHMOD) $(PERM_RWX) $@
    
    resulting in LD_RUN_PATH="" being passed to the command.
    
    Finish removing LD_RUN_PATH from Makefile.perl by removing it from
    the command invocation if it is present.
    
    Note: we use \x24 instead of $ in the regex as there seems to be a bug
    and no level of escaping $ would allow it to be used.
    
    PR: !207
    
    
    Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
    Acked-by: default avatarChristian Boltz <apparmor@cboltz.de>
    (cherry picked from commit 958cc288)
    a1ca25db