NixOS/patchelf
1
0
Fork 0
mirror of https://github.com/NixOS/patchelf.git synced 2025-10-18 09:01:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add option --no-default-lib

Browse Source 
Marks the object that the search for dependencies of this object will ignore any
default library search paths.
This commit is contained in:
Changli Gao
2014-10-23 01:41:47 +08:00
parent 03fc9079b7
commit c09a356552
2 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patchelf.1
View File

@@ -51,6 +51,10 @@ DT_RUNPATH. By default DT_RPATH is converted to DT_RUNPATH.
Removes a declared depency on LIBRARY (DT_NEEDED entry). This Removes a declared depency on LIBRARY (DT_NEEDED entry). This
option can be given multiple times. option can be given multiple times.
.IP "--no-default-lib"
Marks the object that the search for dependencies of this object will ignore any
default library search paths.
.IP --debug .IP --debug
Prints details of the changes made to the input file. Prints details of the changes made to the input file.

50
src/patchelf.cc
View File

@@ -170,6 +170,8 @@ public:
void replaceNeeded(map<string, string>& libs); void replaceNeeded(map<string, string>& libs);
void noDefaultLib();
private: private:
/* Convert an integer in big or little endian representation (as /* Convert an integer in big or little endian representation (as
@@ -1289,6 +1291,46 @@ void ElfFile<ElfFileParamNames>::addNeeded(set<string> libs)
} }
template<ElfFileParams>
void ElfFile<ElfFileParamNames>::noDefaultLib()
{
Elf_Shdr & shdrDynamic = findSection(".dynamic");
Elf_Dyn * dyn = (Elf_Dyn *) (contents + rdi(shdrDynamic.sh_offset));
Elf_Dyn * dynFlags1 = 0;
for ( ; rdi(dyn->d_tag) != DT_NULL; dyn++) {
if (rdi(dyn->d_tag) == DT_FLAGS_1) {
dynFlags1 = dyn;
break;
}
}
if (dynFlags1) {
if (dynFlags1->d_un.d_val & DF_1_NODEFLIB)
return;
dynFlags1->d_un.d_val |= DF_1_NODEFLIB;
} else {
string & newDynamic = replaceSection(".dynamic",
rdi(shdrDynamic.sh_size) + sizeof(Elf_Dyn));
unsigned int idx = 0;
for ( ; rdi(((Elf_Dyn *) newDynamic.c_str())[idx].d_tag) != DT_NULL; idx++) ;
debug("DT_NULL index is %d\n", idx);
/* Shift all entries down by one. */
setSubstr(newDynamic, sizeof(Elf_Dyn),
string(newDynamic, 0, sizeof(Elf_Dyn) * (idx + 1)));
/* Add the DT_FLAGS_1 entry at the top. */
Elf_Dyn newDyn;
wri(newDyn.d_tag, DT_FLAGS_1);
newDyn.d_un.d_val = DF_1_NODEFLIB;
setSubstr(newDynamic, 0, string((char *) &newDyn, sizeof(Elf_Dyn)));
}
changed = true;
}
static bool printInterpreter = false; static bool printInterpreter = false;
static bool printSoname = false; static bool printSoname = false;
static bool setSoname = false; static bool setSoname = false;
@@ -1302,6 +1344,7 @@ static string newRPath;
static set<string> neededLibsToRemove; static set<string> neededLibsToRemove;
static map<string, string> neededLibsToReplace; static map<string, string> neededLibsToReplace;
static set<string> neededLibsToAdd; static set<string> neededLibsToAdd;
static bool noDefaultLib = false;
template<class ElfFile> template<class ElfFile>
static void patchElf2(ElfFile & elfFile, mode_t fileMode) static void patchElf2(ElfFile & elfFile, mode_t fileMode)
@@ -1332,6 +1375,9 @@ static void patchElf2(ElfFile & elfFile, mode_t fileMode)
elfFile.replaceNeeded(neededLibsToReplace); elfFile.replaceNeeded(neededLibsToReplace);
elfFile.addNeeded(neededLibsToAdd); elfFile.addNeeded(neededLibsToAdd);
if (noDefaultLib)
elfFile.noDefaultLib();
if (elfFile.isChanged()){ if (elfFile.isChanged()){
elfFile.rewriteSections(); elfFile.rewriteSections();
writeFile(fileName, fileMode); writeFile(fileName, fileMode);
@@ -1387,6 +1433,7 @@ void showHelp(const string & progName)
[--add-needed LIBRARY]\n\ [--add-needed LIBRARY]\n\
[--remove-needed LIBRARY]\n\ [--remove-needed LIBRARY]\n\
[--replace-needed LIBRARY NEW_LIBRARY]\n\ [--replace-needed LIBRARY NEW_LIBRARY]\n\
[--no-default-lib]\n\
[--debug]\n\ [--debug]\n\
[--version]\n\ [--version]\n\
FILENAME\n", progName.c_str()); FILENAME\n", progName.c_str());
@@ -1461,6 +1508,9 @@ int main(int argc, char * * argv)
else if (arg == "--debug") { else if (arg == "--debug") {
debugMode = true; debugMode = true;
} }
else if (arg == "--no-default-lib") {
noDefaultLib = true;
}
else if (arg == "--help" || arg == "-h" ) { else if (arg == "--help" || arg == "-h" ) {
showHelp(argv[0]); showHelp(argv[0]);
return 0; return 0;