From f088231e3385266723161bc1101334c2a291d9fb Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 4 Aug 2017 02:01:43 -0400 Subject: [PATCH] Remove special mips libraries from Debian build These libraries were needed to support arcboot, which is obsolete and no longer part of Debian. So drop these non-standard, legacy special libraries that were only built on the mips platform. Addresses-Debian-Bug: #864144 Signed-off-by: Theodore Ts'o --- debian/control.in | 2 +- debian/rules | 63 +------------------------------------------------------ 2 files changed, 2 insertions(+), 63 deletions(-) diff --git a/debian/control.in b/debian/control.in index 88896cf..d01ac11 100644 --- a/debian/control.in +++ b/debian/control.in @@ -7,7 +7,7 @@ Source: e2fsprogs Section: admin Priority: required Maintainer: Theodore Y. Ts'o -Build-Depends: gettext, texinfo, pkg-config, gcc-multilib [mips mipsel], libfuse-dev [linux-any kfreebsd-any], libattr1-dev, debhelper (>= 9.0), UTIL_LINUX_NG_DEFINES m4 +Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any], libattr1-dev, debhelper (>= 9.0), UTIL_LINUX_NG_DEFINES m4 Standards-Version: 3.9.8 Homepage: http://e2fsprogs.sourceforge.net diff --git a/debian/rules b/debian/rules index c4e0acf..f36c78d 100755 --- a/debian/rules +++ b/debian/rules @@ -96,8 +96,6 @@ maindir ?= ${debdir}/e2fsprogs e2fsckstaticdir ?= ${debdir}/e2fsck-static debugdir ?= ${debdir}/e2fsprogs-dbg stdbuilddir ?= ${debdir}/BUILD-STD -mipsbuilddir ?= ${debdir}/BUILD-MIPS -mipsbuilddir64 ?= ${debdir}/BUILD-MIPS-64 # docdir ?= ${maindir}/usr/share/doc/${package} MANDIR ?= /usr/share/man mandir ?= ${tmpdir}${MANDIR} @@ -207,20 +205,6 @@ BF_CONF_FLAGS ?= --enable-elf-shlibs --disable-nls --disable-imager \ --disable-testio-debug --disable-uuidd --disable-tls \ --disable-tdb --disable-debugfs -MIPS_NOPIC_CONF_FLAGS ?= --disable-nls --disable-imager \ - --disable-uuidd --disable-tls \ - --disable-resizer # --disable-debugfs - -# we can't use those flags at configure time -MIPS_CFLAGS ?= -G 0 -fno-pic -mno-abicalls -MIPS_CFLAGS_64 ?= -mabi=64 -G 0 -fno-pic -mno-abicalls - -ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) -ifneq (,$(findstring $(DEB_BUILD_ARCH),mips mipsel)) -ismips=ismips -endif -endif - M4_ARGS= DBG_PACKAGES= @@ -312,27 +296,6 @@ else LDFLAGS_STATIC="$(LDFLAGS_STATIC)" endif - # specially-built MIPS libs -ifneq ($(ismips),) - mkdir -p ${mipsbuilddir} ${mipsbuilddir64} - cd ${mipsbuilddir} && AWK=/usr/bin/awk \ - ../../configure ${COMMON_CONF_FLAGS} \ - ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \ - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ - CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \ - CFLAGS_STLIB="$(CFLAGS_STLIB)" \ - LDFLAGS_SHLIB="$(LDFLAGS_SHLIB)" \ - LDFLAGS_STATIC="$(LDFLAGS_STATIC)" - cd ${mipsbuilddir64} && AWK=/usr/bin/awk \ - ../../configure ${COMMON_CONF_FLAGS} \ - ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \ - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ - CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \ - CFLAGS_STLIB="$(CFLAGS_STLIB)" \ - LDFLAGS_SHLIB="$(LDFLAGS_SHLIB)" \ - LDFLAGS_STATIC="$(LDFLAGS_STATIC)" -endif - mkdir -p ${STAMPSDIR} touch ${CFGSTDSTAMP} @@ -388,18 +351,6 @@ endif ( cd ${stdbuilddir}/doc && $(MAKE) V=1 libext2fs.html ) ( cd ${stdbuilddir}/lib/et && $(MAKE) V=1 com_err.info com_err.html ) - # specially-built MIPS libs -ifneq ($(ismips),) - $(MAKE) -C ${mipsbuilddir}/util V=1 - $(MAKE) -C ${mipsbuilddir} V=1 \ - CFLAGS="${CFLAGS} ${MIPS_CFLAGS}" \ - LIB_SUBDIRS="lib/et lib/ext2fs" libs - $(MAKE) -C ${mipsbuilddir64}/util V=1 - $(MAKE) -C ${mipsbuilddir64} V=1 \ - CFLAGS="${CFLAGS} ${MIPS_CFLAGS_64}" \ - LIB_SUBDIRS="lib/et lib/ext2fs" libs -endif - touch ${BUILDSTDSTAMP} build-bf: ${BUILDBFSTAMP} @@ -422,7 +373,7 @@ clean: [ ! -f ${stdbuilddir}/Makefile ] || $(MAKE) -C ${stdbuilddir} V=1 distclean [ ! -f ${bfbuilddir}/Makefile ] || $(MAKE) -C ${bfbuilddir} V=1 distclean [ ! -f ${staticbuilddir}/Makefile ] || $(MAKE) -C ${staticbuilddir} V=1 distclean - rm -rf ${stdbuilddir} ${bfbuilddir} ${staticbuilddir} ${mipsbuilddir} ${mipsbuilddir64} + rm -rf ${stdbuilddir} ${bfbuilddir} ${staticbuilddir} rm -f debian/*.substvars dh_clean @@ -461,14 +412,6 @@ endif dh_movefiles test -z "`find ${tmpdir} -type f`" - # specially-built MIPS libs -ifneq ($(ismips),) - $(INSTALL) -p -m 0644 ${mipsbuilddir}/lib/libext2fs.a \ - ${debdir}/e2fslibs-dev/usr/lib/libext2fs-nopic.a - $(INSTALL) -p -m 0644 ${mipsbuilddir64}/lib/libext2fs.a \ - ${debdir}/e2fslibs-dev/usr/lib/lib64ext2fs-nopic.a -endif - install-udeb: DH_OPTIONS= install-udeb: build dh_testdir @@ -576,11 +519,7 @@ endif ifneq ($(BUILD_E2FSCK_STATIC),no) dh_strip $(call dh_strip_args2,e2fsck-static,e2fsprogs) endif -ifneq ($(ismips),) - dh_strip $(call dh_strip_args,e2fslibs) -Xlib64ext2fs-nopic.a -else dh_strip $(call dh_strip_args,e2fslibs) -endif dh_strip $(call dh_strip_args,libss${SS_SOVERSION}) dh_strip $(call dh_strip_args,libcomerr${COMERR_SOVERSION}) ifneq ($(UTIL_LINUX_NG),yes) -- 1.8.3.1