Attachment #1341 for bug #8846

View | Details | Raw Unified | Return to bug 8846
Collapse All | Expand All

Lines 39-45 Link Here

(-)xfsprogs-2.6.13.orig/copy/Makefile (-1 lines)
39		39
40	LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBPTHREAD)	40	LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBPTHREAD)
41	LTDEPENDENCIES = $(LIBXFS)	41	LTDEPENDENCIES = $(LIBXFS)
42	LLDFLAGS = -static
43		42
44	default: $(LTCOMMAND)	43	default: $(LTCOMMAND)
45		44

Lines 45-51 Link Here

(-)xfsprogs-2.6.13.orig/db/Makefile (-1 lines)
45	LSRCFILES = xfs_admin.sh xfs_check.sh xfs_ncheck.sh	45	LSRCFILES = xfs_admin.sh xfs_check.sh xfs_ncheck.sh
46	LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID)	46	LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID)
47	LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)	47	LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
48	LLDFLAGS += -static
49		48
50	ifeq ($(ENABLE_READLINE),yes)	49	ifeq ($(ENABLE_READLINE),yes)
51	LLDLIBS += $(LIBREADLINE)	50	LLDLIBS += $(LIBREADLINE)

Lines 36-42 Link Here

(-)xfsprogs-2.6.13.orig/fsck/Makefile (-1 lines)
36	LTCOMMAND = fsck.xfs	36	LTCOMMAND = fsck.xfs
37	CFILES = xfs_fsck.c	37	CFILES = xfs_fsck.c
38	LCFLAGS = -s -O3	38	LCFLAGS = -s -O3
39	LLDFLAGS += -static
40		39
41	default: $(LTCOMMAND)	40	default: $(LTCOMMAND)
42		41

Lines 45-51 Link Here

(-)xfsprogs-2.6.13.orig/growfs/Makefile (-1 lines)
45		45
46	LLDLIBS = $(LIBXFS) $(LIBUUID)	46	LLDLIBS = $(LIBXFS) $(LIBUUID)
47	LTDEPENDENCIES = $(LIBXFS)	47	LTDEPENDENCIES = $(LIBXFS)
48	LLDFLAGS = -static
49	LSRCFILES = xfs_info.sh	48	LSRCFILES = xfs_info.sh
50		49
51	default: $(LTCOMMAND)	50	default: $(LTCOMMAND)

Lines 100-109 Link Here

(-)xfsprogs-2.6.13.orig/include/buildmacros (-4 / +1 lines)
100	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \	100	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
101	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \	101	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
102	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \	102	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
103	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \	103	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR);
104	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
105	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
106	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
107	else	104	else
108	INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)	105	INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
109	endif	106	endif

Lines 53-58 Link Here

(-)xfsprogs-2.6.13.orig/libdisk/Makefile (+2 lines)
53	include $(BUILDRULES)	53	include $(BUILDRULES)
54		54
55	install: default	55	install: default
		56	$(INSTALL_LTLIB)
56		57
57	install-dev: default	58	install-dev: default
		59	$(INSTALL_LTLIB_DEV)
58	$(INSTALL_LTLIB_STATIC)	60	$(INSTALL_LTLIB_STATIC)

Lines 49-51 Link Here

(-)xfsprogs-2.6.13.orig/libhandle/Makefile (+1 lines)
49		49
50	install-dev: default	50	install-dev: default
51	$(INSTALL_LTLIB_DEV)	51	$(INSTALL_LTLIB_DEV)
		52	$(INSTALL_LTLIB_STATIC)

Lines 68-73 Link Here

(-)xfsprogs-2.6.13.orig/libxfs/Makefile (+2 lines)
68	include $(BUILDRULES)	68	include $(BUILDRULES)
69		69
70	install: default	70	install: default
		71	$(INSTALL_LTLIB)
71		72
72	install-dev: default	73	install-dev: default
		74	$(INSTALL_LTLIB_DEV)
73	$(INSTALL_LTLIB_STATIC)	75	$(INSTALL_LTLIB_STATIC)

Lines 48-53 Link Here

(-)xfsprogs-2.6.13.orig/libxlog/Makefile (+2 lines)
48	include $(BUILDRULES)	48	include $(BUILDRULES)
49		49
50	install: default	50	install: default
		51	$(INSTALL_LTLIB)
51		52
52	install-dev: default	53	install-dev: default
		54	$(INSTALL_LTLIB_DEV)
53	$(INSTALL_LTLIB_STATIC)	55	$(INSTALL_LTLIB_STATIC)

Lines 42-48 Link Here

(-)xfsprogs-2.6.13.orig/logprint/Makefile (-1 lines)
42		42
43	LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID)	43	LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID)
44	LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)	44	LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
45	LLDFLAGS = -static
46		45
47	default: $(LTCOMMAND)	46	default: $(LTCOMMAND)
48		47

Lines 35-41 Link Here

(-)xfsprogs-2.6.13.orig/mkfile/Makefile (-1 lines)
35		35
36	LTCOMMAND = xfs_mkfile	36	LTCOMMAND = xfs_mkfile
37	CFILES = xfs_mkfile.c	37	CFILES = xfs_mkfile.c
38	LLDFLAGS += -static
39		38
40	default: $(LTCOMMAND)	39	default: $(LTCOMMAND)
41		40

Lines 42-48 Link Here

(-)xfsprogs-2.6.13.orig/mkfs/Makefile (-1 lines)
42		42
43	LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBDISK)	43	LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBDISK)
44	LTDEPENDENCIES = $(LIBXFS) $(LIBDISK)	44	LTDEPENDENCIES = $(LIBXFS) $(LIBDISK)
45	LLDFLAGS = -static
46		45
47	MAXTRLIBS = $(LIBXFS) $(LIBUUID) $(PLDLIBS)	46	MAXTRLIBS = $(LIBXFS) $(LIBUUID) $(PLDLIBS)
48	LSRCFILES = $(MAXTRRES).c $(FSTYP).c	47	LSRCFILES = $(MAXTRRES).c $(FSTYP).c

Lines 47-53 Link Here

(-)xfsprogs-2.6.13.orig/repair/Makefile (-1 lines)
47		47
48	LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID)	48	LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID)
49	LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)	49	LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
50	LLDFLAGS = -static
51		50
52	default: $(LTCOMMAND)	51	default: $(LTCOMMAND)
53		52

Lines 35-41 Link Here

(-)xfsprogs-2.6.13.orig/rtcp/Makefile (-1 lines)
35		35
36	LTCOMMAND = xfs_rtcp	36	LTCOMMAND = xfs_rtcp
37	CFILES = xfs_rtcp.c	37	CFILES = xfs_rtcp.c
38	LLDFLAGS = -static
39		38
40	default: $(LTCOMMAND)	39	default: $(LTCOMMAND)
41		40

Return to bug 8846