null+****@clear*****
null+****@clear*****
2012年 7月 16日 (月) 23:26:21 JST
Kouhei Sutou 2012-07-16 23:26:21 +0900 (Mon, 16 Jul 2012) New Revision: 51abb3ad125a1cd85a1531f7fd1bebd2046b41cb https://github.com/groonga/groonga/commit/51abb3ad125a1cd85a1531f7fd1bebd2046b41cb Log: groonga-httpd: don't add system search path to rpath Modified files: groonga-httpd-conf.sh.in src/nginx-module/config vendor/nginx/configure Modified: groonga-httpd-conf.sh.in (+0 -1) =================================================================== --- groonga-httpd-conf.sh.in 2012-07-16 22:33:20 +0900 (c17fc10) +++ groonga-httpd-conf.sh.in 2012-07-16 23:26:21 +0900 (6d18f12) @@ -7,7 +7,6 @@ pkgsysconfdir="@pkgsysconfdir@" localstatedir="@localstatedir@" export GROONGA_HTTPD_MODULE_PATH="@abs_top_srcdir@/src/nginx-module" -export GROONGA_HTTPD_RPATH="${libdir}" export GROONGA_HTTPD_IN_TREE_INCLUDE_PATH="@abs_top_srcdir@/include" export GROONGA_HTTPD_IN_TREE_LINK_PATH="@abs_top_builddir@/lib/.libs" export GROONGA_HTTPD_PREFIX="${pkgsysconfdir}/httpd" Modified: src/nginx-module/config (+4 -1) =================================================================== --- src/nginx-module/config 2012-07-16 22:33:20 +0900 (b758c32) +++ src/nginx-module/config 2012-07-16 23:26:21 +0900 (7368501) @@ -6,7 +6,10 @@ groonga_strip_switch() if [ "$GROONGA_HTTPD_IN_TREE" = yes ]; then groonga_cflags="-I${GROONGA_HTTPD_IN_TREE_INCLUDE_PATH}" - groonga_libs="-L${GROONGA_HTTPD_IN_TREE_LINK_PATH} -lgroonga -Wl,-rpath -Wl,${GROONGA_HTTPD_RPATH}" + groonga_libs="-L${GROONGA_HTTPD_IN_TREE_LINK_PATH} -lgroonga" + if [ -n "${GROONGA_HTTPD_RPATH}" ]; then + groonga_libs="$groonga_libs -Wl,-rpath -Wl,${GROONGA_HTTPD_RPATH}" + fi ngx_addon_name=ngx_http_groonga_module HTTP_MODULES="$HTTP_MODULES ngx_http_groonga_module" Modified: vendor/nginx/configure (+12 -0) =================================================================== --- vendor/nginx/configure 2012-07-16 22:33:20 +0900 (db79ae6) +++ vendor/nginx/configure 2012-07-16 23:26:21 +0900 (75b2824) @@ -7,6 +7,18 @@ nginx_version=1.2.1 export GROONGA_HTTPD_IN_TREE=yes . "../../groonga-httpd-conf.sh" +eval "`../../libtool --config | grep sys_lib_dlsearch_path_spec=`" +found_libdir_in_dlsearch_path="no" +for dlsearch_path in $sys_lib_dlsearch_path_spec; do + if [ "$dlsearch_path" = "$libdir" ]; then + found_libdir_in_dlsearch_path="yes" + break + fi +done +if [ "$found_libdir_in_dlsearch_path" = "no" ]; then + export GROONGA_HTTPD_RPATH="${libdir}" +fi + source_directory="`dirname \"$0\"`" absolute_source_directory="`cd \"$source_directory\"/../.. && pwd`" -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...下载
