Merge pull request #20 from oracle/deps

Better path searching for deps

Author: vishvananda

build.go

@@ -305,7 +305,7 @@ func buildMock(buildOpts *buildOptions, outputDir string, pkg *ConfigDef, pkgMfs
 		return MockExecuteQuiet(pkg.Mock.Config, name, arg...)
 	}
 
-	if err := SetSoPathsFromExecutor(executor); err != nil {
+	if err := SetSoPathsFromExecutor(executor, nil); err != nil {
 		return err
 	}
 
@@ -358,10 +358,14 @@ func buildOci(buildOpts *buildOptions, outputDir string, pkg *ConfigDef) error {
 
 	// set path for executor
 	path := "/usr/sbin:/usr/bin:/sbin:/bin"
+	ld_library_path := ""
 	for _, e := range pkg.Env {
 		if strings.HasPrefix(e, "PATH=") {
 			path = e[len("PATH="):]
 		}
+		if strings.HasPrefix(e, "LD_LIBRARY_PATH=") {
+			ld_library_path = e[len("LD_LIBRARY_PATH="):]
+		}
 	}
 	executor := func(name string, arg ...string) (string, string, error) {
 		attr := &syscall.SysProcAttr{
@@ -409,7 +413,8 @@ func buildOci(buildOpts *buildOptions, outputDir string, pkg *ConfigDef) error {
 		}
 	}
 
-	if err := SetSoPathsFromExecutor(executor); err != nil {
+	preload := strings.Split(ld_library_path, ":")
+	if err := SetSoPathsFromExecutor(executor, preload); err != nil {
 		return err
 	}
 

deps.go

@@ -10,7 +10,8 @@ import (
 )
 
 var (
-	soMap map[string]string
+	soMap        map[string]string
+	preloadPaths []string
 )
 
 type executor func(name string, arg ...string) (string, string, error)
@@ -19,21 +20,22 @@ type executor func(name string, arg ...string) (string, string, error)
 // the executor should be a function which takes string args and returns
 // stdout, stderr, error. The executor is responsible for setting up the
 // proper environment for ldconfig, by chrooting for example.
-func SetSoPathsFromExecutor(ex executor) error {
+func SetSoPathsFromExecutor(ex executor, preload []string) error {
 	stdout, stderr, err := ex("ldconfig", "-v", "-N", "-X", "/")
 	if err != nil {
 		logrus.Warnf("ldconfig failed: %v", strings.TrimSpace(stderr))
 		return nil
 	}
-	SetSoPaths(stdout)
+	SetSoPaths(stdout, preload)
 	return nil
 }
 
 // SetSoPaths parses a string formatted like the output from
 // ldconfig -v -N -X and stores the so paths for later use by Deps
-func SetSoPaths(ldconfigout string) {
+func SetSoPaths(ldconfigout string, preload []string) {
 	lines := strings.Split(ldconfigout, "\n")
 	soMap = map[string]string{}
+	preloadPaths = preload
 	path := ""
 	for _, line := range lines {
 		if len(line) == 0 {
@@ -54,7 +56,9 @@ func SetSoPaths(ldconfigout string) {
 			// we use the source name for the mapping because we want to
 			// keep the symlink around for the loader
 			source := strings.TrimSpace(parts[0])
-			soMap[source] = filepath.Join(path, source)
+			if _, ok := soMap[source]; !ok {
+				soMap[source] = filepath.Join(path, source)
+			}
 		}
 	}
 }
@@ -103,7 +107,7 @@ func Deps(chrootDir, path string, nss bool) (map[string]struct{}, error) {
 	if err != nil || needs == nil {
 		return result, nil
 	}
-	paths := []string{}
+	paths := preloadPaths
 	runpaths, err := elfFile.DynString(elf.DT_RUNPATH)
 	shortPath := strings.TrimPrefix(path, chrootDir)
 	origin := filepath.Dir(shortPath)

deps_test.go

@@ -35,7 +35,7 @@ func TestDeps(t *testing.T) {
 		expected[dep] = struct{}{}
 	}
 
-	err := SetSoPathsFromExecutor(execute.ExecuteQuiet)
+	err := SetSoPathsFromExecutor(execute.ExecuteQuiet, nil)
 	if err != nil {
 		t.Fatalf("%v", err)
 	}
@@ -55,7 +55,7 @@ func TestDepsNss(t *testing.T) {
 		expected[dep] = struct{}{}
 	}
 
-	err := SetSoPathsFromExecutor(execute.ExecuteQuiet)
+	err := SetSoPathsFromExecutor(execute.ExecuteQuiet, nil)
 	if err != nil {
 		t.Fatalf("%v", err)
 	}
@@ -76,7 +76,7 @@ func TestFindLibrary(t *testing.T) {
 	exec := func(name string, arg ...string) (string, string, error) {
 		return fakeLdconfig, "", nil
 	}
-	err := SetSoPathsFromExecutor(exec)
+	err := SetSoPathsFromExecutor(exec, nil)
 	if err != nil {
 		t.Fatalf("%v", err)
 	}
@@ -92,7 +92,7 @@ func TestFindLibrarySearch(t *testing.T) {
 	exec := func(name string, arg ...string) (string, string, error) {
 		return "", "", nil
 	}
-	err := SetSoPathsFromExecutor(exec)
+	err := SetSoPathsFromExecutor(exec, nil)
 	if err != nil {
 		t.Fatalf("%v", err)
 	}