1 |
vapier 09/06/25 23:56:42 |
2 |
|
3 |
Added: xfsprogs-3.0.1-sharedlibs.patch |
4 |
Log: |
5 |
Version bump #275405 by Lars Wendler and USE=static support #273219 by Wolfram Schlich. |
6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sys-fs/xfsprogs/files/xfsprogs-3.0.1-sharedlibs.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.0.1-sharedlibs.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/xfsprogs/files/xfsprogs-3.0.1-sharedlibs.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: xfsprogs-3.0.1-sharedlibs.patch |
15 |
=================================================================== |
16 |
ripped from PLD Linux |
17 |
|
18 |
--- xfsprogs-3.0.0/libdisk/Makefile |
19 |
+++ xfsprogs-3.0.0/libdisk/Makefile |
20 |
@@ -25,8 +25,9 @@ |
21 |
include $(BUILDRULES) |
22 |
|
23 |
install: default |
24 |
+ $(INSTALL_LTLIB) |
25 |
|
26 |
install-dev: default |
27 |
- $(INSTALL_LTLIB_STATIC) |
28 |
+ $(INSTALL_LTLIB_DEV) |
29 |
|
30 |
install-qa: install-dev |
31 |
--- xfsprogs-3.0.0/libxfs/Makefile |
32 |
+++ xfsprogs-3.0.0/libxfs/Makefile |
33 |
@@ -41,7 +41,9 @@ |
34 |
include $(BUILDRULES) |
35 |
|
36 |
install: default |
37 |
+ $(INSTALL_LTLIB) |
38 |
|
39 |
install-dev: default |
40 |
+ $(INSTALL_LTLIB_DEV) |
41 |
|
42 |
install-qa: default |
43 |
--- xfsprogs-3.0.0/libxlog/Makefile |
44 |
+++ xfsprogs-3.0.0/libxlog/Makefile |
45 |
@@ -12,6 +12,8 @@ |
46 |
|
47 |
CFILES = xfs_log_recover.c util.c |
48 |
|
49 |
+LTLIBS = $(LIBUUID) $(LIBXFS) |
50 |
+ |
51 |
# don't want to link xfs_repair with a debug libxlog. |
52 |
DEBUG = -DNDEBUG |
53 |
|
54 |
@@ -19,4 +21,10 @@ |
55 |
|
56 |
include $(BUILDRULES) |
57 |
|
58 |
-install install-dev install-qa: default |
59 |
+install: default |
60 |
+ $(INSTALL_LTLIB) |
61 |
+ |
62 |
+install-dev: default |
63 |
+ $(INSTALL_LTLIB_DEV) |
64 |
+ |
65 |
+install-qa: default |
66 |
|
67 |
--- xfsprogs-3.0.0/Makefile |
68 |
+++ xfsprogs-3.0.0/Makefile |
69 |
@@ -41,6 +41,7 @@ |
70 |
mkfs: libxfs libdisk |
71 |
quota: libxcmd |
72 |
repair: libxfs libxlog |
73 |
+libxlog: libxfs |
74 |
|
75 |
ifeq ($(HAVE_BUILDDEFS), yes) |
76 |
include $(BUILDRULES) |
77 |
--- xfsprogs-3.0.0/include/buildmacros |
78 |
+++ xfsprogs-3.0.0/include/buildmacros |
79 |
@@ -69,17 +69,9 @@ |
80 |
# /usr/lib. |
81 |
ifeq ($(ENABLE_SHARED),yes) |
82 |
INSTALL_LTLIB_DEV = \ |
83 |
- cd $(TOPDIR)/$(LIBNAME)/.libs; \ |
84 |
- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ |
85 |
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ |
86 |
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ |
87 |
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
88 |
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ |
89 |
- if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ |
90 |
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ |
91 |
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ |
92 |
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ |
93 |
- fi |
94 |
+ cd $(TOPDIR)/$(LIBNAME); \ |
95 |
+ $(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ |
96 |
+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_DEVLIB_DIR)/$(LIBNAME).la |
97 |
else |
98 |
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) |
99 |
endif |