summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-30 17:02:55 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-30 17:02:55 +0000
commite1c7260efbcaa9b2263f926f15f2608db73e1205 (patch)
tree9026cb3fb7fd0dd990a1a6b49c45a0317a97c5c0 /sys-fs/xfsprogs/files
parentold, broken with new glibc (diff)
downloadgentoo-2-e1c7260efbcaa9b2263f926f15f2608db73e1205.tar.gz
gentoo-2-e1c7260efbcaa9b2263f926f15f2608db73e1205.tar.bz2
gentoo-2-e1c7260efbcaa9b2263f926f15f2608db73e1205.zip
old, broken with new glibc
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/xfsprogs/files')
-rw-r--r--sys-fs/xfsprogs/files/xfsprogs-3.0.1-sharedlibs.patch98
-rw-r--r--sys-fs/xfsprogs/files/xfsprogs-3.1.2-depend.patch239
2 files changed, 0 insertions, 337 deletions
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.0.1-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.0.1-sharedlibs.patch
deleted file mode 100644
index 32af7a2fede8..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-3.0.1-sharedlibs.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-ripped from PLD Linux
-
---- xfsprogs-3.0.0/libdisk/Makefile
-+++ xfsprogs-3.0.0/libdisk/Makefile
-@@ -25,8 +25,9 @@
- include $(BUILDRULES)
-
- install: default
-+ $(INSTALL_LTLIB)
-
- install-dev: default
-- $(INSTALL_LTLIB_STATIC)
-+ $(INSTALL_LTLIB_DEV)
-
- install-qa: install-dev
---- xfsprogs-3.0.1/libxcmd/Makefile
-+++ xfsprogs-3.0.1/libxcmd/Makefile
-@@ -24,4 +24,10 @@
-
- include $(BUILDRULES)
-
--install install-dev install-qa: default
-+install: default
-+ $(INSTALL_LTLIB)
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
---- xfsprogs-3.0.0/libxfs/Makefile
-+++ xfsprogs-3.0.0/libxfs/Makefile
-@@ -41,7 +41,9 @@
- include $(BUILDRULES)
-
- install: default
-+ $(INSTALL_LTLIB)
-
- install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- install-qa: default
---- xfsprogs-3.0.0/libxlog/Makefile
-+++ xfsprogs-3.0.0/libxlog/Makefile
-@@ -12,6 +12,8 @@
-
- CFILES = xfs_log_recover.c util.c
-
-+LTLIBS = $(LIBUUID) $(LIBXFS)
-+
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
-
-@@ -19,4 +21,10 @@
-
- include $(BUILDRULES)
-
--install install-dev install-qa: default
-+install: default
-+ $(INSTALL_LTLIB)
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
-
---- xfsprogs-3.0.0/Makefile
-+++ xfsprogs-3.0.0/Makefile
-@@ -41,6 +41,7 @@
- mkfs: libxfs libdisk
- quota: libxcmd
- repair: libxfs libxlog
-+libxlog: libxfs
-
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
---- xfsprogs-3.0.0/include/buildmacros
-+++ xfsprogs-3.0.0/include/buildmacros
-@@ -69,17 +69,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-- cd $(TOPDIR)/$(LIBNAME)/.libs; \
-- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
-- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
-- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
-- if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
-- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
-- fi
-+ cd $(TOPDIR)/$(LIBNAME); \
-+ $(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_DEVLIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.2-depend.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.2-depend.patch
deleted file mode 100644
index 4c1b16e8ad7c..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-3.1.2-depend.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-http://bugs.gentoo.org/333155
-
-hackish fix for constant dependency and parallel build failures
-
---- a/copy/Makefile
-+++ b/copy/Makefile
-@@ -13,7 +13,7 @@
- LTDEPENDENCIES = $(LIBXFS)
- LLDFLAGS =
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- include $(BUILDRULES)
-
---- a/db/Makefile
-+++ b/db/Makefile
-@@ -30,7 +30,7 @@
- CFLAGS += -DENABLE_EDITLINE
- endif
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- include $(BUILDRULES)
-
---- a/estimate/Makefile
-+++ b/estimate/Makefile
-@@ -9,7 +9,7 @@
- LTCOMMAND = xfs_estimate
- CFILES = xfs_estimate.c
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- include $(BUILDRULES)
-
---- a/fsr/Makefile
-+++ b/fsr/Makefile
-@@ -10,7 +10,7 @@
- CFILES = xfs_fsr.c
- LLDLIBS = $(LIBHANDLE)
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- include $(BUILDRULES)
-
---- a/growfs/Makefile
-+++ b/growfs/Makefile
-@@ -22,7 +22,7 @@
- LLDFLAGS =
- LSRCFILES = xfs_info.sh
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- include $(BUILDRULES)
-
---- a/include/buildrules
-+++ b/include/buildrules
-@@ -94,10 +94,9 @@
-
- MAKEDEP := $(MAKEDEPEND) $(CFLAGS)
-
--ltdepend: $(CFILES) $(HFILES)
-+# a bit hackish, but works for now
-+LTDEP_FILTER = $(SED) -e 's,^\([^:]*\)\.o,\1.lo,'
-+DEP_FILTER = cat
-+.dep: $(CFILES) $(HFILES)
- @echo " [DEP]"
-- $(Q)$(MAKEDEP) $(CFILES) | $(SED) -e 's,^\([^:]*\)\.o,\1.lo,' > .dep
--
--depend: $(CFILES) $(HFILES)
-- @echo " [DEP]"
-- $(Q)$(MAKEDEP) $(CFILES) > .dep
-+ $(Q)$(MAKEDEP) $(CFILES) | $(DEP_FILTER) > .dep
---- a/io/Makefile
-+++ b/io/Makefile
-@@ -63,7 +63,7 @@
- LCFLAGS += -DHAVE_FALLOCATE
- endif
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- include $(BUILDRULES)
-
---- a/libdisk/Makefile
-+++ b/libdisk/Makefile
-@@ -20,7 +20,7 @@
- LSRCFILES = $(LINUX_DRIVERS)
- endif
-
--default: ltdepend $(LTLIBRARY)
-+default: $(LTLIBRARY)
-
- include $(BUILDRULES)
-
-@@ -32,4 +32,5 @@
-
- install-qa: install-dev
-
-+DEP_FILTER = $(LTDEP_FILTER)
- -include .dep
---- a/libhandle/Makefile
-+++ b/libhandle/Makefile
-@@ -15,7 +15,7 @@
- CFILES = handle.c jdm.c
- LSRCFILES = libhandle.sym
-
--default: ltdepend $(LTLIBRARY)
-+default: $(LTLIBRARY)
-
- include $(BUILDRULES)
-
-@@ -27,4 +27,5 @@
-
- install-qa: install-dev
-
-+DEP_FILTER = $(LTDEP_FILTER)
- -include .dep
---- a/libxcmd/Makefile
-+++ b/libxcmd/Makefile
-@@ -28,7 +28,7 @@
- LCFLAGS += -DENABLE_EDITLINE
- endif
-
--default: ltdepend $(LTLIBRARY)
-+default: $(LTLIBRARY)
-
- include $(BUILDRULES)
-
-@@ -40,4 +40,5 @@
-
- install-qa: default
-
-+DEP_FILTER = $(LTDEP_FILTER)
- -include .dep
---- a/libxfs/Makefile
-+++ b/libxfs/Makefile
-@@ -36,7 +36,7 @@
- # don't try linking xfs_repair with a debug libxfs.
- DEBUG = -DNDEBUG
-
--default: ltdepend $(LTLIBRARY)
-+default: $(LTLIBRARY)
-
- include $(BUILDRULES)
-
-@@ -48,4 +48,5 @@
-
- install-qa: default
-
-+DEP_FILTER = $(LTDEP_FILTER)
- -include .dep
---- a/libxlog/Makefile
-+++ b/libxlog/Makefile
-@@ -17,7 +17,7 @@
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
-
--default: ltdepend $(LTLIBRARY)
-+default: $(LTLIBRARY)
-
- include $(BUILDRULES)
-
-@@ -29,4 +29,5 @@
-
- install-qa: default
-
-+DEP_FILTER = $(LTDEP_FILTER)
- -include .dep
---- a/logprint/Makefile
-+++ b/logprint/Makefile
-@@ -16,7 +16,7 @@
- LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
- LLDFLAGS =
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- include $(BUILDRULES)
-
---- a/mdrestore/Makefile
-+++ b/mdrestore/Makefile
-@@ -12,7 +12,7 @@
- LTDEPENDENCIES = $(LIBXFS)
- LLDFLAGS =
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- include $(BUILDRULES)
-
---- a/mkfs/Makefile
-+++ b/mkfs/Makefile
-@@ -27,7 +27,7 @@
- LSRCFILES = $(FSTYP).c
- LDIRT = $(FSTYP)
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- ifneq ($(ENABLE_BLKID),yes)
- default: $(FSTYP)
---- a/quota/Makefile
-+++ b/quota/Makefile
-@@ -28,7 +28,7 @@
- CFLAGS += -DENABLE_EDITLINE
- endif
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- include $(BUILDRULES)
-
---- a/repair/Makefile
-+++ b/repair/Makefile
-@@ -24,7 +24,7 @@
- LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
- LLDFLAGS =
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- globals.o: globals.h
-
---- a/rtcp/Makefile
-+++ b/rtcp/Makefile
-@@ -9,7 +9,7 @@
- CFILES = xfs_rtcp.c
- LLDFLAGS =
-
--default: depend $(LTCOMMAND)
-+default: $(LTCOMMAND)
-
- include $(BUILDRULES)
-