pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Fix for mail/notmuch shared library install_name on Darwin



Hello.

The package mail/notmuch from -current on Mac OS X Mavericks (10.9.4)
(Darwin 13.3.0), installs the notmuch shared library with an incorrect
install_name which prevents programs that link against it as a dependent
library (e.g. notmuch) from finding it when they run.  The install_name
of the notmuch library is set to the file name of the shared library,
but it should instead be the full path.  Attached is a patch to fix
this.  Would a developer be willing to commit this patch?

I reported the problem upstream at

  http://notmuchmail.org/pipermail/notmuch/2014/018956.html

Thank you!

Lewis
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/notmuch/distinfo,v
retrieving revision 1.2
diff -b -u -r1.2 distinfo
--- distinfo    3 Jul 2014 15:01:46 -0000       1.2
+++ distinfo    1 Sep 2014 03:34:25 -0000
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = d439fe1539c14524832e0059ad8201f8131e3b04
 SHA1 (patch-doc_Makefile.local) = 4bdae1a7cb16db7ffd60948b30a1b73fe73af8ea
 SHA1 (patch-doc_prerst2man.py) = 66db50b64da9d0ccb4ec35cd9fb8327524e19af8
+SHA1 (patch-lib_Makefile.local) = b6aff48b540419af21c673f1c9882a471cebcb9c
Index: patches/patch-lib_Makefile.local
===================================================================
RCS file: patches/patch-lib_Makefile.local
diff -N patches/patch-lib_Makefile.local
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_Makefile.local    1 Sep 2014 03:34:25 -0000
@@ -0,0 +1,22 @@
+$NetBSD$
+
+* On Mac OS X (Darwin), for the install_name of the notmuch shared
+  library, use the full path rather than just the file name.  This
+  enables programs that link against it as a dependent library to find
+  it when they run.
+
+  Upstream bug report:
+
+    http://notmuchmail.org/pipermail/notmuch/2014/018956.html
+
+--- lib/Makefile.local.orig    2014-06-25 05:30:10.000000000 -0500
++++ lib/Makefile.local 2014-08-29 10:09:41.000000000 -0500
+@@ -27,7 +27,7 @@
+ LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
+ SONAME = libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBRARY_SUFFIX)
+ LIBNAME = 
libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE).$(LIBRARY_SUFFIX)
+-LIBRARY_LINK_FLAG = -dynamiclib -install_name $(SONAME) 
-compatibility_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR) 
-current_version 
$(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)
++LIBRARY_LINK_FLAG = -dynamiclib -install_name $(libdir)/$(SONAME) 
-compatibility_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR) 
-current_version 
$(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)
+ else
+ LIBRARY_SUFFIX = so
+ LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)


Home | Main Index | Thread Index | Old Index