mirror of https://github.com/vitalif/e2fsprogs
libquota: only build a static library
Since the libquota library has namespace contamination issues, don't build a shared library and link against it statically. Don't include it as part of the Debian packages. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>bitmap-optimize
parent
55e00a2503
commit
8f9d708f6a
|
@ -89,13 +89,13 @@ LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@
|
|||
LIBE2P = $(LIB)/libe2p@LIB_EXT@
|
||||
LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
|
||||
LIBUUID = @LIBUUID@ @SOCKET_LIB@
|
||||
LIBQUOTA = @LIBQUOTA@
|
||||
LIBQUOTA = @STATIC_LIBQUOTA@
|
||||
LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
|
||||
LIBINTL = @LIBINTL@
|
||||
DEPLIBSS = $(LIB)/libss@LIB_EXT@
|
||||
DEPLIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
|
||||
DEPLIBUUID = @DEPLIBUUID@
|
||||
DEPLIBQUOTA = @DEPLIBQUOTA@
|
||||
DEPLIBQUOTA = @DEPSTATIC_LIBQUOTA@
|
||||
DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(DEPLIBUUID)
|
||||
|
||||
STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ @DLOPEN_LIB@
|
||||
|
|
|
@ -2,8 +2,6 @@ usr/lib/*/*.so
|
|||
usr/lib/*/*.a
|
||||
usr/include/ext2fs
|
||||
usr/include/e2p
|
||||
usr/include/quota
|
||||
usr/share/info/libext2fs.info*
|
||||
usr/lib/*/pkgconfig/e2p.pc
|
||||
usr/lib/*/pkgconfig/ext2fs.pc
|
||||
usr/lib/*/pkgconfig/quota.pc
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
lib/*/libext2fs*
|
||||
lib/*/libe2p*
|
||||
lib/*/libquota*
|
||||
|
|
|
@ -514,56 +514,3 @@ libext2fs.so.2 e2fslibs #MINVER#
|
|||
test_io_manager@Base 1.37
|
||||
undo_io_manager@Base 1.41.0
|
||||
unix_io_manager@Base 1.37
|
||||
libquota.so.1 e2fslibs #MINVER#
|
||||
compute_quota@Base 1.41.99
|
||||
dict_alloc_insert@Base 1.41.99
|
||||
dict_allow_dupes@Base 1.41.99
|
||||
dict_contains@Base 1.41.99
|
||||
dict_count@Base 1.41.99
|
||||
dict_first@Base 1.41.99
|
||||
dict_free_nodes@Base 1.41.99
|
||||
dict_init@Base 1.41.99
|
||||
dict_insert@Base 1.41.99
|
||||
dict_isempty@Base 1.41.99
|
||||
dict_isfull@Base 1.41.99
|
||||
dict_last@Base 1.41.99
|
||||
dict_lookup@Base 1.41.99
|
||||
dict_next@Base 1.41.99
|
||||
dict_prev@Base 1.41.99
|
||||
dict_set_allocator@Base 1.41.99
|
||||
dnode_create@Base 1.41.99
|
||||
dnode_destroy@Base 1.41.99
|
||||
dnode_get@Base 1.41.99
|
||||
dnode_getkey@Base 1.41.99
|
||||
dnode_init@Base 1.41.99
|
||||
end_io@Base 1.41.99
|
||||
get_empty_dquot@Base 1.41.99
|
||||
get_qf_name@Base 1.41.99
|
||||
get_qf_path@Base 1.41.99
|
||||
init_io@Base 1.41.99
|
||||
init_quota_context@Base 1.41.99
|
||||
is_quota_on@Base 1.41.99
|
||||
new_io@Base 1.41.99
|
||||
qtree_delete_dquot@Base 1.41.99
|
||||
qtree_dqstr_in_blk@Base 1.41.99
|
||||
qtree_entry_unused@Base 1.41.99
|
||||
qtree_read_dquot@Base 1.41.99
|
||||
qtree_scan_dquots@Base 1.41.99
|
||||
qtree_write_dquot@Base 1.41.99
|
||||
quota_data_add@Base 1.41.99
|
||||
quota_data_inodes@Base 1.41.99
|
||||
quota_data_sub@Base 1.41.99
|
||||
quota_file_exists@Base 1.41.99
|
||||
quotafile_ops_2@Base 1.41.99
|
||||
release_quota_context@Base 1.41.99
|
||||
remove_quota_inode@Base 1.41.99
|
||||
set_sb_quota_inum@Base 1.41.99
|
||||
smalloc@Base 1.41.99
|
||||
srealloc@Base 1.41.99
|
||||
sstrdup@Base 1.41.99
|
||||
sstrncat@Base 1.41.99
|
||||
sstrncpy@Base 1.41.99
|
||||
truncate_quota_inode@Base 1.41.99
|
||||
type2name@Base 1.41.99
|
||||
update_grace_times@Base 1.41.99
|
||||
write_quota_inode@Base 1.41.99
|
||||
|
|
|
@ -353,6 +353,9 @@ install-std: build
|
|||
# statically-linked fsck
|
||||
${INSTALL_PROGRAM} $(E2FSCK_STATIC) ${tmpdir}/sbin
|
||||
cp ${mandir}/man8/e2fsck.8 ${mandir}/man8/e2fsck.static.8
|
||||
# remove static quota library for now
|
||||
rm ${tmpdir}/usr/include/quota/mkquota.h
|
||||
find ${tmpdir}/usr/lib -name quota.pc -o -name libquota.a | xargs rm
|
||||
|
||||
dh_movefiles
|
||||
test -z "`find ${tmpdir} -type f`"
|
||||
|
|
|
@ -27,21 +27,21 @@ SRCS= $(srcdir)/common.c \
|
|||
LIBRARY= libquota
|
||||
LIBDIR= quota
|
||||
|
||||
ELF_VERSION = 1.0
|
||||
ELF_SO_VERSION = 1
|
||||
ELF_IMAGE = libquota
|
||||
ELF_MYDIR = quota
|
||||
ELF_INSTALL_DIR = $(root_libdir)
|
||||
ELF_OTHER_LIBS = -L../.. -lext2fs
|
||||
#ELF_VERSION = 1.0
|
||||
#ELF_SO_VERSION = 1
|
||||
#ELF_IMAGE = libquota
|
||||
#ELF_MYDIR = quota
|
||||
#ELF_INSTALL_DIR = $(root_libdir)
|
||||
#ELF_OTHER_LIBS = -L../.. -lext2fs
|
||||
|
||||
BSDLIB_VERSION = 1.0
|
||||
BSDLIB_IMAGE = libquota
|
||||
BSDLIB_MYDIR = quota
|
||||
BSDLIB_INSTALL_DIR = $(root_libdir)
|
||||
#BSDLIB_VERSION = 1.0
|
||||
#BSDLIB_IMAGE = libquota
|
||||
#BSDLIB_MYDIR = quota
|
||||
#BSDLIB_INSTALL_DIR = $(root_libdir)
|
||||
|
||||
@MAKEFILE_LIBRARY@
|
||||
@MAKEFILE_ELF@
|
||||
@MAKEFILE_BSDLIB@
|
||||
#MAKEFILE_ELF#
|
||||
#MAKEFILE_BSDLIB#
|
||||
@MAKEFILE_PROFILE@
|
||||
@MAKEFILE_CHECKER@
|
||||
|
||||
|
@ -50,8 +50,8 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
|
|||
$(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
@CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
@ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
@BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
|
||||
#ELF_CMT# $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
#BSDLIB_CMT# $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
|
||||
|
||||
all:: $(SMANPAGES) quota.pc
|
||||
|
||||
|
@ -66,10 +66,10 @@ dict.o:
|
|||
@PROFILE_CMT@ $(top_srcdir)/e2fsck/dict.c
|
||||
@CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c \
|
||||
@CHECKER_CMT@ $(top_srcdir)/e2fsck/dict.c
|
||||
@ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c \
|
||||
@ELF_CMT@ $(top_srcdir)/e2fsck/dict.c
|
||||
@BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c \
|
||||
@BSDLIB_CMT@ $(top_srcdir)/e2fsck/dict.c
|
||||
#ELF_CMT# $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c \
|
||||
#ELF_CMT# $(top_srcdir)/e2fsck/dict.c
|
||||
#BSDLIB_CMT# $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c \
|
||||
#BSDLIB_CMT# $(top_srcdir)/e2fsck/dict.c
|
||||
|
||||
installdirs::
|
||||
$(E) " MKINSTALLDIRS $(libdir) $(includedir)/quota $(man3dir)"
|
||||
|
|
Loading…
Reference in New Issue