diff --git a/recipe/build.sh b/recipe/build.sh index 35c7bae..36b5492 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -22,7 +22,7 @@ for i in `ls`; do ln -s ${PREFIX}/${targetsDir}/$j ${PREFIX}/$j if [[ $j =~ \.so\. ]]; then - patchelf --set-rpath '$ORIGIN' ${PREFIX}/${targetsDir}/$j + patchelf --set-rpath '$ORIGIN' --force-rpath ${PREFIX}/${targetsDir}/$j fi done fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 77cfb24..6a52ab1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -25,7 +25,7 @@ source: sha256: fb57c570cbd71c167d8b4227508b39bdf8d2e79a38ba6f669217045d774df027 # [win] build: - number: 0 + number: 1 binary_relocation: false skip: true # [osx] diff --git a/recipe/test-rpath.sh b/recipe/test-rpath.sh index 16ee3b4..16ad3a7 100644 --- a/recipe/test-rpath.sh +++ b/recipe/test-rpath.sh @@ -11,7 +11,11 @@ for lib in `find ${PREFIX}/${targetsDir}/lib -type f`; do rpath=$(patchelf --print-rpath $lib) echo "$lib rpath: $rpath" - [[ $rpath == "\$ORIGIN" ]] || errors+="$lib\n" + if [[ $rpath != "\$ORIGIN" ]]; then + errors+="$lib\n" + elif [[ $(objdump -x ${lib} | grep "PATH") == *"RUNPATH"* ]]; then + errors+="$lib\n" + fi done if [[ $errors ]]; then