From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-util/confix/files/2.3.0/local-libs-first.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 dev-util/confix/files/2.3.0/local-libs-first.patch (limited to 'dev-util/confix/files/2.3.0/local-libs-first.patch') diff --git a/dev-util/confix/files/2.3.0/local-libs-first.patch b/dev-util/confix/files/2.3.0/local-libs-first.patch deleted file mode 100644 index 29d4a7a1cc9d..000000000000 --- a/dev-util/confix/files/2.3.0/local-libs-first.patch +++ /dev/null @@ -1,39 +0,0 @@ -With libtool, link local libraries with /path/to/libfile.la instead of libpath, -to avoid encoding local libpath into installed la-file. -These also have to be linked first, to avoid finding already installed -libraries of previous versions during libtool-relink. -diff -ru Confix-2.3.0.orig/libconfix/plugins/automake/c/out_c.py Confix-2.3.0/libconfix/plugins/automake/c/out_c.py ---- Confix-2.3.0.orig/libconfix/plugins/automake/c/out_c.py 2010-07-06 12:55:59.286540943 +0200 -+++ Confix-2.3.0/libconfix/plugins/automake/c/out_c.py 2010-07-06 13:01:23.574428852 +0200 -@@ -411,6 +411,8 @@ - """ - assert isinstance(linked_builder, LinkedBuilder) - -+ local_paths = [] -+ local_libraries = [] - native_paths = [] - native_libraries = [] - external_linkline = [] -@@ -424,8 +426,11 @@ - - for bi in native_libs_to_use: - if isinstance(bi, BuildInfo_CLibrary_NativeLocal): -- native_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir())) -- native_libraries.append('-l'+bi.basename()) -+ if self.__use_libtool: -+ local_libraries.append('/'.join(['$(top_builddir)']+bi.dir()+['lib'+bi.basename()+'.la'])) -+ else: -+ local_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir())) -+ local_libraries.append('-l'+bi.basename()) - continue - if isinstance(bi, BuildInfo_CLibrary_NativeInstalled): - using_installed_library = True -@@ -447,7 +452,7 @@ - external_linkline.extend(elem) - pass - -- return native_paths + native_libraries + external_linkline -+ return local_paths + local_libraries + native_paths + native_libraries + external_linkline - - def external_libpath(self): - """ For unit tests only. """ -- cgit v1.2.3