tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
xfstools: remove unused patch
Franz Pletz
8 years ago
4d10bb5e
2d44bf1c
-89
1 changed file
expand all
collapse all
unified
split
pkgs
tools
filesystems
xfsprogs
4.3.0-sharedlibs.patch
-89
pkgs/tools/filesystems/xfsprogs/4.3.0-sharedlibs.patch
···
1
-
--- xfsprogs-4.3.0/include/buildmacros
2
-
+++ xfsprogs-4.3.0/include/buildmacros
3
-
@@ -70,18 +70,9 @@
4
-
# /usr/lib.
5
-
ifeq ($(ENABLE_SHARED),yes)
6
-
INSTALL_LTLIB_DEV = \
7
-
- cd $(TOPDIR)/$(LIBNAME)/.libs; \
8
-
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
9
-
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
10
-
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
11
-
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
12
-
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
13
-
- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
14
-
- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
15
-
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
16
-
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
17
-
- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
18
-
- fi
19
-
+ set -e; cd $(TOPDIR)/$(LIBNAME); \
20
-
+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
21
-
+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
22
-
else
23
-
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
24
-
endif
25
-
--- xfsprogs-4.3.0/libxcmd/Makefile
26
-
+++ xfsprogs-4.3.0/libxcmd/Makefile
27
-
@@ -34,6 +34,9 @@
28
-
29
-
include $(BUILDRULES)
30
-
31
-
-install install-dev: default
32
-
+install: default
33
-
+
34
-
+install-dev: default
35
-
+ $(INSTALL_LTLIB_DEV)
36
-
37
-
-include .ltdep
38
-
--- xfsprogs-4.3.0/libxfs/Makefile
39
-
+++ xfsprogs-4.3.0/libxfs/Makefile
40
-
@@ -138,6 +138,7 @@
41
-
42
-
install-dev: install
43
-
$(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
44
-
+ $(INSTALL_LTLIB_DEV)
45
-
46
-
# We need to install the headers before building the dependencies. If we
47
-
# include the .ltdep file, the makefile decides that it needs to build the
48
-
--- xfsprogs-4.3.0/libxlog/Makefile
49
-
+++ xfsprogs-4.3.0/libxlog/Makefile
50
-
@@ -12,6 +12,8 @@
51
-
52
-
CFILES = xfs_log_recover.c util.c
53
-
54
-
+LTLIBS = $(LIBUUID) $(LIBXFS)
55
-
+
56
-
# don't want to link xfs_repair with a debug libxlog.
57
-
DEBUG = -DNDEBUG
58
-
59
-
@@ -19,6 +21,9 @@
60
-
61
-
include $(BUILDRULES)
62
-
63
-
-install install-dev: default
64
-
+install: default
65
-
+
66
-
+install-dev: default
67
-
+ $(INSTALL_LTLIB_DEV)
68
-
69
-
-include .ltdep
70
-
--- xfsprogs-4.3.0/quota/Makefile
71
-
+++ xfsprogs-4.3.0/quota/Makefile
72
-
@@ -16,7 +16,6 @@ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
73
-
74
-
LLDLIBS = $(LIBXCMD)
75
-
LTDEPENDENCIES = $(LIBXCMD)
76
-
-LLDFLAGS = -static
77
-
78
-
ifeq ($(ENABLE_READLINE),yes)
79
-
LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
80
-
--- xfsprogs-4.3.0/mdrestore/Makefile
81
-
+++ xfsprogs-4.3.0/mdrestore/Makefile
82
-
@@ -10,7 +10,6 @@ CFILES = xfs_mdrestore.c
83
-
84
-
LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID)
85
-
LTDEPENDENCIES = $(LIBXFS)
86
-
-LLDFLAGS = -static
87
-
88
-
default: depend $(LTCOMMAND)
89
-
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0