| 1 | --- configure.orig 2009-06-15 09:22:20.000000000 -0600 |
| 2 | +++ configure 2009-07-07 23:51:35.000000000 -0600 |
| 3 | @@ -31854,10 +31854,10 @@ |
| 4 | DYLIB_EXT=".dylib" |
| 5 | dylib_ldflags="${darwin_dylib_ldflags}" |
| 6 | MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed -e "s/[\.][1-9]$/.0/"` |
| 7 | - LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" |
| 8 | - RLAPACK_LDFLAGS="-install_name libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" |
| 9 | + LIBR_LDFLAGS="-install_name \$(libdir)/R/lib/libR.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" |
| 10 | + RLAPACK_LDFLAGS="-install_name \$(libdir)/R/lib/libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION} -headerpad_max_install_names" |
| 11 | ## don't use version in libRblas so we can replace it with any BLAS implementation |
| 12 | - RBLAS_LDFLAGS="-install_name libRblas.dylib -headerpad_max_install_names" |
| 13 | + RBLAS_LDFLAGS="-install_name \$(libdir)/R/lib/libRblas.dylib -headerpad_max_install_names" |
| 14 | ;; |
| 15 | hpux*) |
| 16 | ## Needs to avoid embedding a relative path ../../../bin. |
| 17 | @@ -38329,20 +38329,6 @@ |
| 18 | fi |
| 19 | |
| 20 | |
| 21 | -case "${host_os}" in |
| 22 | - darwin*) |
| 23 | - ## In order to allow the R build to be relocatable, we strip paths |
| 24 | - ## from all shlibs and rely on DYLD_LIBRARY_PATH. Unfortunately |
| 25 | - ## Darwin linker ignores it at build-time and doesn't use -L to |
| 26 | - ## resolve dylib dependencies, so libRblas will not be found unless |
| 27 | - ## we tell ld where it lives. I don't know of any more elegant solution :/ |
| 28 | - if test "x${use_blas_shlib}" = xyes; then |
| 29 | - LIBR="${LIBR} -dylib_file libRblas.dylib:\$(R_HOME)/lib\$(R_ARCH)/libRblas.dylib" |
| 30 | - fi |
| 31 | - ;; |
| 32 | -esac |
| 33 | - |
| 34 | - |
| 35 | ## This version is used to build a shared BLAS lib |
| 36 | BLAS_LIBS0=${BLAS_LIBS} |
| 37 | |