Contents of /trunk/xfsprogs/patches/xfsprogs-3.1.7-sharedlibs.patch
Parent Directory | Revision Log
Revision 1634 -
(show annotations)
(download)
Sun Feb 5 01:10:20 2012 UTC (12 years, 7 months ago) by niro
File size: 3155 byte(s)
Sun Feb 5 01:10:20 2012 UTC (12 years, 7 months ago) by niro
File size: 3155 byte(s)
-added sharedlib patch
1 | ripped from PLD Linux |
2 | |
3 | --- xfsprogs-3.1.2/libdisk/Makefile |
4 | +++ xfsprogs-3.1.2/libdisk/Makefile |
5 | @@ -25,8 +25,10 @@ |
6 | include $(BUILDRULES) |
7 | |
8 | install: default |
9 | + $(INSTALL_LTLIB) |
10 | |
11 | install-dev: default |
12 | + $(INSTALL_LTLIB_DEV) |
13 | |
14 | install-qa: install-dev |
15 | |
16 | --- xfsprogs-3.1.2/libxcmd/Makefile |
17 | +++ xfsprogs-3.1.2/libxcmd/Makefile |
18 | @@ -32,6 +32,12 @@ |
19 | |
20 | include $(BUILDRULES) |
21 | |
22 | -install install-dev install-qa: default |
23 | +install: default |
24 | + $(INSTALL_LTLIB) |
25 | + |
26 | +install-dev: default |
27 | + $(INSTALL_LTLIB_DEV) |
28 | + |
29 | +install-qa: default |
30 | |
31 | -include .dep |
32 | --- xfsprogs-3.1.2/libxfs/Makefile |
33 | +++ xfsprogs-3.1.2/libxfs/Makefile |
34 | @@ -41,7 +41,9 @@ |
35 | include $(BUILDRULES) |
36 | |
37 | install: default |
38 | + $(INSTALL_LTLIB_ROOT) |
39 | |
40 | install-dev: default |
41 | + $(INSTALL_LTLIB_DEV) |
42 | |
43 | install-qa: default |
44 | --- xfsprogs-3.1.2/libxlog/Makefile |
45 | +++ xfsprogs-3.1.2/libxlog/Makefile |
46 | @@ -12,6 +12,8 @@ |
47 | |
48 | CFILES = xfs_log_recover.c util.c |
49 | |
50 | +LTLIBS = $(LIBUUID) $(LIBXFS) |
51 | + |
52 | # don't want to link xfs_repair with a debug libxlog. |
53 | DEBUG = -DNDEBUG |
54 | |
55 | @@ -19,6 +21,12 @@ |
56 | |
57 | include $(BUILDRULES) |
58 | |
59 | -install install-dev install-qa: default |
60 | +install: default |
61 | + $(INSTALL_LTLIB_ROOT) |
62 | + |
63 | +install-dev: default |
64 | + $(INSTALL_LTLIB_DEV) |
65 | + |
66 | +install-qa: default |
67 | |
68 | -include .dep |
69 | --- xfsprogs-3.1.2/Makefile |
70 | +++ xfsprogs-3.1.2/Makefile |
71 | @@ -66,6 +66,7 @@ |
72 | mkfs: libxfs |
73 | quota: libxcmd |
74 | repair: libxfs libxlog |
75 | +libxlog: libxfs |
76 | |
77 | ifneq ($(ENABLE_BLKID), yes) |
78 | mkfs: libdisk |
79 | --- xfsprogs-3.1.2/include/buildmacros |
80 | +++ xfsprogs-3.1.2/include/buildmacros |
81 | @@ -56,11 +56,13 @@ |
82 | endif |
83 | |
84 | ifeq ($(ENABLE_SHARED),yes) |
85 | -INSTALL_LTLIB = \ |
86 | +_INSTALL_LTLIB = set -e; \ |
87 | cd $(TOPDIR)/$(LIBNAME)/.libs; \ |
88 | - ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ |
89 | - ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ |
90 | - ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR) |
91 | + ../$(INSTALL) -m 755 -d $(1); \ |
92 | + ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(1); \ |
93 | + ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(1) |
94 | +INSTALL_LTLIB_ROOT = $(call _INSTALL_LTLIB,$(PKG_ROOT_LIB_DIR)) |
95 | +INSTALL_LTLIB = $(call _INSTALL_LTLIB,$(PKG_LIB_DIR)) |
96 | endif |
97 | |
98 | # Libtool thinks the static and shared libs should be in the same dir, so |
99 | @@ -71,17 +71,9 @@ |
100 | # /usr/lib. |
101 | ifeq ($(ENABLE_SHARED),yes) |
102 | INSTALL_LTLIB_DEV = \ |
103 | - cd $(TOPDIR)/$(LIBNAME)/.libs; \ |
104 | - ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
105 | - ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ |
106 | - ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ |
107 | - ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ |
108 | - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ |
109 | - if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \ |
110 | - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ |
111 | - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ |
112 | - ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ |
113 | - fi |
114 | + set -e; cd $(TOPDIR)/$(LIBNAME); \ |
115 | + $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ |
116 | + env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la |
117 | else |
118 | INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) |
119 | endif |