diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-04-13 15:02:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-04-13 15:02:30 +0000 |
| commit | 9b86a9dc962db5124fa35030bc96d20c57ed3b3a (patch) | |
| tree | 986e441afb3d7cf11450a13275e2d90ca1c61a7d /sys-fs/ntfs3g/files | |
| parent | Mask upcoming ~x11-misc/redshift-1.9 (diff) | |
| download | gentoo-2-9b86a9dc962db5124fa35030bc96d20c57ed3b3a.tar.gz gentoo-2-9b86a9dc962db5124fa35030bc96d20c57ed3b3a.tar.bz2 gentoo-2-9b86a9dc962db5124fa35030bc96d20c57ed3b3a.zip | |
Disable split /usr check in build as it breaks when cross-compiling for diff ABIs. We handle this logic ourselves in the ebuild.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-fs/ntfs3g/files')
| -rw-r--r-- | sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch b/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch new file mode 100644 index 000000000000..0228bfec330b --- /dev/null +++ b/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch @@ -0,0 +1,25 @@ +we handle split /usr logic ourselves. this ends up breaking when building +for an abi that doesn't exist in / (like cross-compiling) as the tests fail. + +--- a/libntfs-3g/Makefile.in ++++ b/libntfs-3g/Makefile.in +@@ -912,19 +912,6 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local \ + uninstall-rootlibLTLIBRARIES + + +-# We may need to move .so files to root +-# And create ldscript or symbolic link from /usr +-install-exec-hook: install-rootlibLTLIBRARIES +-@INSTALL_LIBRARY_TRUE@ if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \ +-@INSTALL_LIBRARY_TRUE@ $(MV) -f "$(DESTDIR)/$(libdir)"/libntfs-3g.so* "$(DESTDIR)/$(rootlibdir)"; \ +-@INSTALL_LIBRARY_TRUE@ fi +-@GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@ if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \ +-@GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@ $(install_sh_PROGRAM) "libntfs-3g.script.so" "$(DESTDIR)/$(libdir)/libntfs-3g.so"; \ +-@GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@ fi +-@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@ if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \ +-@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@ $(LN_S) "$(rootlibdir)/libntfs-3g.so" "$(DESTDIR)/$(libdir)/libntfs-3g.so"; \ +-@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@ fi +- + uninstall-local: + @INSTALL_LIBRARY_TRUE@ $(RM) -f "$(DESTDIR)/$(rootlibdir)"/libntfs-3g.so* + |