pyuno/Library_pyuno_wrapper.mk | 2 -- pyuno/source/module/pyuno_dlopenwrapper.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
New commits: commit 094978d48db63b61f62f9b82c0af275769e2519e Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed May 8 20:13:23 2013 +0200 No need for RTLD_NOW here ...it was like that "since the beginning," but for no apparent reason. Change-Id: Ic293739b5cd5de0bfe9e2580a0755af64202e582 diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c b/pyuno/source/module/pyuno_dlopenwrapper.c index 2f9d4fc..8f3f53b 100644 --- a/pyuno/source/module/pyuno_dlopenwrapper.c +++ b/pyuno/source/module/pyuno_dlopenwrapper.c @@ -61,7 +61,7 @@ static void * load(void * address, char const * symbol) { } strncpy(libname, dl_info.dli_fname, len); strcpy(libname + len, SAL_DLLPREFIX "pyuno" SAL_DLLEXTENSION); - h = dlopen(libname, RTLD_NOW | RTLD_GLOBAL); + h = dlopen(libname, RTLD_LAZY | RTLD_GLOBAL); free(libname); if (h == NULL) { fprintf(stderr, "failed to load pyuno: '%s'\n", dlerror()); commit cf49e8b816ee3391b5deba487d1abf77b7dfeaab Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed May 8 18:50:04 2013 +0200 Library_puyuno_wrapper is not built on WNT anyway Change-Id: Ia4e2f9d5f3475b0a7af8b6db80ba4b2cd5f6bfce diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk index eb5c7c3..66e75fb 100644 --- a/pyuno/Library_pyuno_wrapper.mk +++ b/pyuno/Library_pyuno_wrapper.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_externals,pyuno_wrapper,\ $(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib)) $(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc)) -ifneq ($(OS)$(COM),WNTMSC) ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) $(eval $(call gb_Library_add_libs,pyuno_wrapper,\ @@ -40,7 +39,6 @@ $(eval $(call gb_Library_add_libs,pyuno_wrapper,\ )) endif -endif $(eval $(call gb_Library_add_cobjects,pyuno_wrapper,\ pyuno/source/module/pyuno_dlopenwrapper \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits