Skip to content

Instantly share code, notes, and snippets.

@anddam
Created October 30, 2013 22:11
Show Gist options
  • Save anddam/7241256 to your computer and use it in GitHub Desktop.
Save anddam/7241256 to your computer and use it in GitHub Desktop.
Index: Portfile
===================================================================
--- Portfile (revision 112710)
+++ Portfile (working copy)
@@ -4,7 +4,7 @@
name libtool
version 2.4.2
-revision 3
+revision 4
categories devel sysutils
# Scripts are GPL-2+, libltdl is LGPL-2+, but all parts that tend to be
# distributed with dependents have a licensing exception that allows
@@ -43,8 +43,13 @@
# Patch to allow -stdlib=* for the linker
# See ticket 32982.
# committed upstream -> remove for libtool 2.4.3
-patchfiles ltmain.m4sh-allow-clang-stdlib.diff
+patchfiles ltmain.m4sh-allow-clang-stdlib.diff \
+ patch-configure.diff
+post-patch {
+ reinplace "s,@DL_SEARCH_PATH@,${prefix}/lib," ${worksrcpath}/configure
+}
+
use_parallel_build yes
post-destroot {
Index: files/patch-configure.diff
===================================================================
--- files/patch-configure.diff (revision 0)
+++ files/patch-configure.diff (working copy)
@@ -0,0 +1,38 @@
+--- configure.orig 2013-10-30 23:06:54.000000000 +0100
++++ configure 2013-10-30 23:08:45.000000000 +0100
+@@ -11019,7 +11019,7 @@
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++ sys_lib_dlsearch_path_spec='@DL_SEARCH_PATH@ /usr/local/lib /lib /usr/lib'
+ ;;
+
+ dgux*)
+@@ -16172,7 +16172,7 @@
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++ sys_lib_dlsearch_path_spec='@DL_SEARCH_PATH@ /usr/local/lib /lib /usr/lib'
+ ;;
+
+ dgux*)
+@@ -19114,7 +19114,7 @@
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++ sys_lib_dlsearch_path_spec='@DL_SEARCH_PATH@ /usr/local/lib /lib /usr/lib'
+ ;;
+
+ dgux*)
+@@ -22186,7 +22186,7 @@
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++ sys_lib_dlsearch_path_spec='@DL_SEARCH_PATH@ /usr/local/lib /lib /usr/lib'
+ ;;
+
+ dgux*)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment