1 |
dev-zero 10/06/03 21:25:56 |
2 |
|
3 |
Added: xfsprogs-3.1.1-sharedlibs.patch |
4 |
Log: |
5 |
Version bump (bug #311109), added deps for readline/libedit, added static-libs use flag, changed dependency from e2fsprogs to util-linux, thanks to Hendrik Leppkes for the updated patch. |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: xfsprogs-3.1.1-sharedlibs.patch |
15 |
=================================================================== |
16 |
diff --git a/Makefile b/Makefile |
17 |
index 83d1b0a..3e4217d 100644 |
18 |
--- a/Makefile |
19 |
+++ b/Makefile |
20 |
@@ -66,6 +66,7 @@ io: libxcmd libhandle |
21 |
mkfs: libxfs |
22 |
quota: libxcmd |
23 |
repair: libxfs libxlog |
24 |
+libxlog: libxfs |
25 |
|
26 |
ifneq ($(ENABLE_BLKID), yes) |
27 |
mkfs: libdisk |
28 |
diff --git a/include/buildmacros b/include/buildmacros |
29 |
index 62babca..0a3c5ba 100644 |
30 |
--- a/include/buildmacros |
31 |
+++ b/include/buildmacros |
32 |
@@ -71,17 +71,9 @@ endif |
33 |
# /usr/lib. |
34 |
ifeq ($(ENABLE_SHARED),yes) |
35 |
INSTALL_LTLIB_DEV = \ |
36 |
- cd $(TOPDIR)/$(LIBNAME)/.libs; \ |
37 |
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
38 |
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ |
39 |
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ |
40 |
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ |
41 |
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ |
42 |
- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \ |
43 |
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ |
44 |
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ |
45 |
- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ |
46 |
- fi |
47 |
+ cd $(TOPDIR)/$(LIBNAME); \ |
48 |
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
49 |
+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la |
50 |
else |
51 |
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) |
52 |
endif |
53 |
diff --git a/libdisk/Makefile b/libdisk/Makefile |
54 |
index 32416a5..7a144c0 100644 |
55 |
--- a/libdisk/Makefile |
56 |
+++ b/libdisk/Makefile |
57 |
@@ -25,8 +25,10 @@ default: ltdepend $(LTLIBRARY) |
58 |
include $(BUILDRULES) |
59 |
|
60 |
install: default |
61 |
+ $(INSTALL_LTLIB) |
62 |
|
63 |
install-dev: default |
64 |
+ $(INSTALL_LTLIB_DEV) |
65 |
|
66 |
install-qa: install-dev |
67 |
|
68 |
diff --git a/libxcmd/Makefile b/libxcmd/Makefile |
69 |
index 60b6f9e..38e53a6 100644 |
70 |
--- a/libxcmd/Makefile |
71 |
+++ b/libxcmd/Makefile |
72 |
@@ -32,6 +32,12 @@ default: ltdepend $(LTLIBRARY) |
73 |
|
74 |
include $(BUILDRULES) |
75 |
|
76 |
-install install-dev install-qa: default |
77 |
+install: default |
78 |
+ $(INSTALL_LTLIB) |
79 |
+ |
80 |
+install-dev: default |
81 |
+ $(INSTALL_LTLIB_DEV) |
82 |
+ |
83 |
+install-qa: default |
84 |
|
85 |
-include .dep |
86 |
diff --git a/libxfs/Makefile b/libxfs/Makefile |
87 |
index 8f80cdc..fcba668 100644 |
88 |
--- a/libxfs/Makefile |
89 |
+++ b/libxfs/Makefile |
90 |
@@ -41,8 +41,10 @@ default: ltdepend $(LTLIBRARY) |
91 |
include $(BUILDRULES) |
92 |
|
93 |
install: default |
94 |
+ $(INSTALL_LTLIB) |
95 |
|
96 |
install-dev: default |
97 |
+ $(INSTALL_LTLIB_DEV) |
98 |
|
99 |
install-qa: default |
100 |
|
101 |
diff --git a/libxlog/Makefile b/libxlog/Makefile |
102 |
index 7358fb1..666ea77 100644 |
103 |
--- a/libxlog/Makefile |
104 |
+++ b/libxlog/Makefile |
105 |
@@ -12,6 +12,8 @@ LT_AGE = 0 |
106 |
|
107 |
CFILES = xfs_log_recover.c util.c |
108 |
|
109 |
+LTLIBS = $(LIBUUID) $(LIBXFS) |
110 |
+ |
111 |
# don't want to link xfs_repair with a debug libxlog. |
112 |
DEBUG = -DNDEBUG |
113 |
|
114 |
@@ -19,6 +21,12 @@ default: ltdepend $(LTLIBRARY) |
115 |
|
116 |
include $(BUILDRULES) |
117 |
|
118 |
-install install-dev install-qa: default |
119 |
+install: default |
120 |
+ $(INSTALL_LTLIB) |
121 |
+ |
122 |
+install-dev: default |
123 |
+ $(INSTALL_LTLIB_DEV) |
124 |
+ |
125 |
+install-qa: default |
126 |
|
127 |
-include .dep |