pkgsrc-Users archive

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

[PATCH] devel/talloc: Fix library install names on Darwin



Fix install names in all libraries on Darwin.  Previously, only the
talloc library was being fixed.  This allows the package to build
successfully with PKG_DEVELOPER=yes.
---

This is against pkgsrc-2015Q4.  Would a developer be willing to commit?

Thanks!

Lewis

 devel/talloc/Makefile | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index 266d0d0..041bf99 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -33,16 +33,29 @@ REPLACE_PYTHON+=	wscript
 
 .include "../../mk/bsd.prefs.mk"
 
-# Fix incorrect install_name of talloc library on Darwin.  Don't bother
-# fixing similar problem in pytalloc-util nor the Python talloc.so
-# since those reference other build-time paths in addition to having an
-# incorrect install_name; they will remain broken.
+# Fix install names of libraries on Darwin.
 # Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=10791
 post-install:
 .if ${OPSYS} == "Darwin"
-	install_name_tool -id \
+	install_name_tool \
+	    -id \
+	    ${PREFIX}/lib/libpytalloc-util.${PKGVERSION_NOREV}.dylib \
+	    -change \
+	    ${WRKSRC}/bin/default/libtalloc.dylib \
+	    ${PREFIX}/lib/libtalloc.dylib \
+	    ${DESTDIR}${PREFIX}/lib/libpytalloc-util.${PKGVERSION_NOREV}.dylib
+	install_name_tool \
+	    -id \
 	    ${PREFIX}/lib/libtalloc.${PKGVERSION_NOREV}.dylib \
 	    ${DESTDIR}${PREFIX}/lib/libtalloc.${PKGVERSION_NOREV}.dylib
+	install_name_tool \
+	    -change \
+	    ${WRKSRC}/bin/default/libpytalloc-util.dylib \
+	    ${PREFIX}/lib/libpytalloc-util.dylib \
+	    -change \
+	    ${WRKSRC}/bin/default/libtalloc.dylib \
+	    ${PREFIX}/lib/libtalloc.dylib \
+	    ${DESTDIR}${PREFIX}/${PYSITELIB}/talloc.so
 .endif
 
 .include "../../lang/python/application.mk"
-- 
2.5.4 (Apple Git-61)



Home | Main Index | Thread Index | Old Index