Hi, two patches against SVN -r17154 attached. (Found in current SVN -r17279).
The first corrects an obvious typo that inhibits an install_name specification from being passed to the MacOS linker. The second is provided to specify the library version /before/ the dylib suffix instead of after it, unless the suffix is ".so". Thus, ".dll" and ".dylib" remain at the end of the filename, like it should be (as I suppose -- I do not develop on ".dll" platforms). Note that applications will be locked to the filename given as install_name. Therefore, the precision of the version number given should be chosen carefully. Regards, -- Christian Cornelssen
--- common/Make.global_options.in.orig 2008-10-20 01:21:59.000000000 +0200
+++ common/Make.global_options.in 2008-10-20 02:55:09.000000000 +0200
@@ -117,7 +117,7 @@
ifeq (@DEAL_II_LD_UNDERSTANDS_SONAME@,yes)
DEAL_II_ADD_SONAME = -Wl,-soname,$(call DEAL_II_SHLIB_NAME,$(1))
else
- ifeq (@DEAL_II_LD_UNDERSTANDS_SONAME@,yes)
+ ifeq (@DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME@,yes)
DEAL_II_ADD_SONAME = -Wl,-dylib_install_name -Wl,$(call
DEAL_II_SHLIB_NAME,$(1))
else
DEAL_II_ADD_SONAME =
--- common/Make.global_options.in.bak 2008-10-20 02:55:09.000000000 +0200 +++ common/Make.global_options.in 2008-10-20 03:05:20.000000000 +0200 @@ -112,8 +112,11 @@ lib-deal2-3d.g = $(LIBDIR)/libdeal_II_3d.g$(lib-suffix) # dealing with shared libraries -DEAL_II_SHLIB_NAME = lib$(1)$(shared-lib-suffix).$(DEAL_II_VERSION) - +ifeq ($(shared-lib-suffix),.so) + DEAL_II_SHLIB_NAME = lib$(1)$(shared-lib-suffix).$(DEAL_II_VERSION) +else + DEAL_II_SHLIB_NAME = lib$(1).$(DEAL_II_VERSION)$(shared-lib-suffix) +endif ifeq (@DEAL_II_LD_UNDERSTANDS_SONAME@,yes) DEAL_II_ADD_SONAME = -Wl,-soname,$(call DEAL_II_SHLIB_NAME,$(1)) else
signature.asc
Description: PGP signature
_______________________________________________
