From: cristy Date: Sun, 30 Oct 2011 00:20:44 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6712 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a44f623c92081ee9dd5038c02484d428dfff3510;p=imagemagick --- diff --git a/config/ltmain.sh b/config/ltmain.sh index 78cf01752..aa5624c81 100644 --- a/config/ltmain.sh +++ b/config/ltmain.sh @@ -8050,7 +8050,7 @@ EOF elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; + *) func_apped perm_rpath " $libdir" ;; esac fi done diff --git a/libtool b/libtool index 025fcf37e..010107dee 100755 --- a/libtool +++ b/libtool @@ -272,7 +272,7 @@ finish_eval="" hardcode_into_libs=yes # Compile-time system search path for libraries. -sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.6.1 /usr/lib64 /lib64 " +sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.6.2 /usr/lib64 /lib64 " # Run-time system search path for libraries. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib/llvm /usr/lib64/llvm /usr/lib64/mysql /usr/lib64/qt-3.3/lib /usr/lib64/tcl8.5/tclx8.4 /usr/lib64/tcl8.5 /usr/lib64/tracker-0.12 /usr/lib/wine/ /usr/lib64/wine/ /usr/lib64/xulrunner-2 " @@ -8490,7 +8490,7 @@ EOF elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath+=" $libdir" ;; + *) func_apped perm_rpath " $libdir" ;; esac fi done @@ -10213,17 +10213,17 @@ file_list_spec="" hardcode_action=immediate # The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.6.1 /usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../.." +compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.6.2 /usr/lib/gcc/x86_64-redhat-linux/4.6.2/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.6.2/../../.." # Dependencies to place before and after the objects being linked to # create a shared library. -predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.6.1/crtbeginS.o" -postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.1/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../lib64/crtn.o" +predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.2/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.6.2/crtbeginS.o" +postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.2/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.6.2/../../../../lib64/crtn.o" predeps="" postdeps="-lstdc++ -lm -lgcc_s -lpthread -lc -lgcc_s" # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.6.1 -L/usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../.." +compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.6.2 -L/usr/lib/gcc/x86_64-redhat-linux/4.6.2/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.6.2/../../.." # ### END LIBTOOL TAG CONFIG: CXX