| 1 |
vapier 13/12/25 08:49:36 |
| 2 |
|
| 3 |
Added: xfsprogs-3.1.11-sharedlibs.patch |
| 4 |
Log: |
| 5 |
Install extra headers for libxfs #486514 by Stefan Reimer. Rewrite shared lib installs to only use libtool to avoid rpath issues. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-fs/xfsprogs/files/xfsprogs-3.1.11-sharedlibs.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.11-sharedlibs.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.11-sharedlibs.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: xfsprogs-3.1.11-sharedlibs.patch |
| 16 |
=================================================================== |
| 17 |
use libtool to do all installing. do not use the manual file install as |
| 18 |
that'll copy files directly from the .libs/ subdir which might have rpaths |
| 19 |
that we do not want. |
| 20 |
|
| 21 |
--- a/libdisk/Makefile |
| 22 |
+++ b/libdisk/Makefile |
| 23 |
@@ -25,6 +25,7 @@ |
| 24 |
install: default |
| 25 |
|
| 26 |
install-dev: default |
| 27 |
+ $(INSTALL_LTLIB_DEV) |
| 28 |
|
| 29 |
install-qa: install-dev |
| 30 |
|
| 31 |
--- a/libhandle/Makefile |
| 32 |
+++ b/libhandle/Makefile |
| 33 |
@@ -20,7 +20,6 @@ |
| 34 |
include $(BUILDRULES) |
| 35 |
|
| 36 |
install: default |
| 37 |
- $(INSTALL_LTLIB) |
| 38 |
|
| 39 |
install-dev: default |
| 40 |
$(INSTALL_LTLIB_DEV) |
| 41 |
--- a/libxcmd/Makefile |
| 42 |
+++ b/libxcmd/Makefile |
| 43 |
@@ -32,6 +32,11 @@ |
| 44 |
|
| 45 |
include $(BUILDRULES) |
| 46 |
|
| 47 |
-install install-dev install-qa: default |
| 48 |
+install: default |
| 49 |
+ |
| 50 |
+install-dev: default |
| 51 |
+ $(INSTALL_LTLIB_DEV) |
| 52 |
+ |
| 53 |
+install-qa: default |
| 54 |
|
| 55 |
-include .dep |
| 56 |
--- a/libxfs/Makefile |
| 57 |
+++ b/libxfs/Makefile |
| 58 |
@@ -41,5 +41,6 @@ |
| 59 |
install: default |
| 60 |
|
| 61 |
install-dev: default |
| 62 |
+ $(INSTALL_LTLIB_DEV) |
| 63 |
|
| 64 |
install-qa: default |
| 65 |
--- a/libxlog/Makefile |
| 66 |
+++ b/libxlog/Makefile |
| 67 |
@@ -12,6 +12,8 @@ |
| 68 |
|
| 69 |
CFILES = xfs_log_recover.c util.c |
| 70 |
|
| 71 |
+LTLIBS = $(LIBUUID) $(LIBXFS) |
| 72 |
+ |
| 73 |
# don't want to link xfs_repair with a debug libxlog. |
| 74 |
DEBUG = -DNDEBUG |
| 75 |
|
| 76 |
@@ -19,6 +21,11 @@ |
| 77 |
|
| 78 |
include $(BUILDRULES) |
| 79 |
|
| 80 |
-install install-dev install-qa: default |
| 81 |
+install: default |
| 82 |
+ |
| 83 |
+install-dev: default |
| 84 |
+ $(INSTALL_LTLIB_DEV) |
| 85 |
+ |
| 86 |
+install-qa: default |
| 87 |
|
| 88 |
-include .dep |
| 89 |
--- a/Makefile |
| 90 |
+++ b/Makefile |
| 91 |
@@ -66,6 +66,8 @@ |
| 92 |
mkfs: libxfs |
| 93 |
quota: libxcmd |
| 94 |
repair: libxfs libxlog |
| 95 |
+libxlog: libxfs |
| 96 |
+libxlog-install-dev: libxfs-install-dev |
| 97 |
|
| 98 |
ifneq ($(ENABLE_BLKID), yes) |
| 99 |
mkfs: libdisk |
| 100 |
--- a/include/buildmacros |
| 101 |
+++ b/include/buildmacros |
| 102 |
@@ -71,17 +71,9 @@ |
| 103 |
# /usr/lib. |
| 104 |
ifeq ($(ENABLE_SHARED),yes) |
| 105 |
INSTALL_LTLIB_DEV = \ |
| 106 |
- cd $(TOPDIR)/$(LIBNAME)/.libs; \ |
| 107 |
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
| 108 |
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ |
| 109 |
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ |
| 110 |
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ |
| 111 |
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ |
| 112 |
- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \ |
| 113 |
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ |
| 114 |
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ |
| 115 |
- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ |
| 116 |
- fi |
| 117 |
+ set -e; cd $(TOPDIR)/$(LIBNAME); \ |
| 118 |
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
| 119 |
+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la |
| 120 |
else |
| 121 |
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) |
| 122 |
endif |
Archives