mirror of https://github.com/vitalif/e2fsprogs
ChangeLog, configure, configure.in, e2fsprogs.spec:
e2fsprogs.spec: Update spec file for Red Hat 7.0 compatibility configure.in: When compiling shared libraries for Solaris, use a special-case Makefile fragment to deal with it. Makefile.solaris-lib: New file for Solaris shared library builds.bitmap-optimize
Theodore Ts'o
parent
0056be14d7
commit
f5955dda1d
|
|
@ -1,3 +1,10 @@
|
|||
2000-10-24 <tytso@snap.thunk.org>
|
||||
|
||||
* e2fsprogs.spec: Update spec file for Red Hat 7.0 compatibility
|
||||
|
||||
* configure.in: When compiling shared libraries for Solaris, use a
|
||||
special-case Makefile fragment to deal with it.
|
||||
|
||||
2000-08-18 <tytso@valinux.com>
|
||||
|
||||
* configure.in (JFS_DEBUG): Add support for --enable-jfs-debug
|
||||
|
|
|
|||
|
|
@ -163,6 +163,11 @@ then
|
|||
else
|
||||
ELF_CMT=
|
||||
MAKEFILE_ELF=$srcdir/lib/Makefile.elf-lib
|
||||
[case "$host_os" in
|
||||
solaris2.*)
|
||||
MAKEFILE_ELF=$srcdir/lib/Makefile.solaris-lib
|
||||
;;
|
||||
esac]
|
||||
BINARY_TYPE=elfbin
|
||||
LIB_EXT=.so
|
||||
echo "Enabling ELF shared libraries"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
Summary: Utilities for managing the second extended (ext2) filesystem.
|
||||
Name: e2fsprogs
|
||||
Version: 1.19
|
||||
Version: 1.20-WIP
|
||||
Release: 0
|
||||
Copyright: GPL
|
||||
Group: System Environment/Base
|
||||
Buildroot: /var/tmp/%{name}-root
|
||||
Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-1.19.tar.gz
|
||||
Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
|
||||
Prereq: /sbin/ldconfig
|
||||
|
||||
%description
|
||||
|
|
@ -41,7 +41,8 @@ also need to install e2fsprogs.
|
|||
%setup
|
||||
|
||||
%build
|
||||
CFLAGS="$RPM_OPT_FLAGS" ./configure --enable-elf-shlibs
|
||||
CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
|
||||
./configure --enable-elf-shlibs --mandir=%{_mandir} --infodir=%{_infodir}
|
||||
|
||||
make libs progs docs
|
||||
|
||||
|
|
@ -62,12 +63,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
%post devel
|
||||
if [ -x /sbin/install-info ]; then
|
||||
/sbin/install-info /usr/info/libext2fs.info.gz /usr/info/dir
|
||||
/sbin/install-info %{_infodir}/libext2fs.info.gz %{_infodir}/dir
|
||||
fi
|
||||
|
||||
%postun devel
|
||||
if [ $1 = 0 -a -x /sbin/install-info ]; then
|
||||
/sbin/install-info --delete /usr/info/libext2fs.info.gz /usr/info/dir
|
||||
/sbin/install-info --delete %{_infodir}/libext2fs.info.gz %{_infodir}/dir
|
||||
fi
|
||||
|
||||
%files
|
||||
|
|
@ -97,24 +98,24 @@ fi
|
|||
/usr/bin/chattr
|
||||
/usr/bin/lsattr
|
||||
/usr/bin/uuidgen
|
||||
/usr/man/man1/chattr.1*
|
||||
/usr/man/man1/lsattr.1*
|
||||
/usr/man/man1/uuidgen.1*
|
||||
{_mandir}/man1/chattr.1*
|
||||
{_mandir}/man1/lsattr.1*
|
||||
{_mandir}/man1/uuidgen.1*
|
||||
|
||||
/usr/man/man8/badblocks.8*
|
||||
/usr/man/man8/debugfs.8*
|
||||
/usr/man/man8/dumpe2fs.8*
|
||||
/usr/man/man8/e2fsck.8*
|
||||
/usr/man/man8/e2label.8*
|
||||
/usr/man/man8/fsck.8*
|
||||
/usr/man/man8/mke2fs.8*
|
||||
/usr/man/man8/mklost+found.8*
|
||||
/usr/man/man8/resize2fs.8*
|
||||
/usr/man/man8/tune2fs.8*
|
||||
{_mandir}/man8/badblocks.8*
|
||||
{_mandir}/man8/debugfs.8*
|
||||
{_mandir}/man8/dumpe2fs.8*
|
||||
{_mandir}/man8/e2fsck.8*
|
||||
{_mandir}/man8/e2label.8*
|
||||
{_mandir}/man8/fsck.8*
|
||||
{_mandir}/man8/mke2fs.8*
|
||||
{_mandir}/man8/mklost+found.8*
|
||||
{_mandir}/man8/resize2fs.8*
|
||||
{_mandir}/man8/tune2fs.8*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
/usr/info/libext2fs.info*
|
||||
%{_infodir}/libext2fs.info*
|
||||
/usr/bin/compile_et
|
||||
/usr/bin/mk_cmds
|
||||
|
||||
|
|
@ -135,6 +136,6 @@ fi
|
|||
/usr/include/ext2fs
|
||||
/usr/include/ss
|
||||
/usr/include/uuid
|
||||
/usr/man/man1/compile_et.1*
|
||||
/usr/man/man3/com_err.3*
|
||||
{_mandir}/man1/compile_et.1*
|
||||
{_mandir}/man3/com_err.3*
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
#
|
||||
# This is a Makefile stub which handles the creation of Linux ELF shared
|
||||
# libraries.
|
||||
#
|
||||
# In order to use this stub, the following makefile variables must be defined.
|
||||
#
|
||||
# ELF_VERSION = 1.0
|
||||
# ELF_SO_VERSION = 1
|
||||
# ELF_IMAGE = libce
|
||||
# ELF_MYDIR = et
|
||||
# ELF_INSTALL_DIR = $(SHLIBDIR)
|
||||
# ELF_OTHER_LIBS = -lc
|
||||
|
||||
all:: elfshared image
|
||||
|
||||
subdirs:: elfshared
|
||||
|
||||
elfshared:
|
||||
mkdir elfshared
|
||||
|
||||
ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
|
||||
ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
|
||||
|
||||
image: $(ELF_LIB)
|
||||
|
||||
$(ELF_LIB): $(OBJS)
|
||||
(cd elfshared; $(CC) --shared -o $(ELF_LIB) -Wl,-h,$(ELF_SONAME) \
|
||||
$(OBJS) $(ELF_OTHER_LIBS))
|
||||
$(MV) elfshared/$(ELF_LIB) .
|
||||
$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
|
||||
$(LN) $(ELF_LIB) ../$(ELF_LIB)
|
||||
$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
|
||||
$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
|
||||
|
||||
installdirs-elf-lib::
|
||||
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ELF_INSTALL_DIR) \
|
||||
$(DESTDIR)$(libdir)
|
||||
|
||||
installdirs:: installdirs-elf-lib
|
||||
|
||||
install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
|
||||
$(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
|
||||
$(STRIP) -x \
|
||||
$(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
|
||||
$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
|
||||
$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
|
||||
$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
|
||||
-ldconfig
|
||||
|
||||
uninstall-shlibs uninstall::
|
||||
$(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
|
||||
$(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
|
||||
$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
|
||||
-ldconfig
|
||||
|
||||
clean::
|
||||
$(RM) -rf elfshared
|
||||
$(RM) -f $(ELF_LIB)
|
||||
$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
|
||||
Loading…
Reference in New Issue