diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2013-10-18 08:17:44 +0000 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2013-10-18 08:17:44 +0000 |
commit | 1b76a2b759c662de87f309bfa081794a70aa1327 (patch) | |
tree | 3dec1efbbc33b7e4cec8e709338cfc31dd7880da /sys-fs/xfsprogs/files | |
parent | Version bump (diff) | |
download | gentoo-2-1b76a2b759c662de87f309bfa081794a70aa1327.tar.gz gentoo-2-1b76a2b759c662de87f309bfa081794a70aa1327.tar.bz2 gentoo-2-1b76a2b759c662de87f309bfa081794a70aa1327.zip |
Version bump. Removed old
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'sys-fs/xfsprogs/files')
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch | 120 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch | 35 |
2 files changed, 0 insertions, 155 deletions
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch deleted file mode 100644 index ded1f30d6d9e..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch +++ /dev/null @@ -1,120 +0,0 @@ -ripped from PLD Linux - ---- xfsprogs-3.1.2/libdisk/Makefile -+++ xfsprogs-3.1.2/libdisk/Makefile -@@ -25,8 +25,10 @@ - include $(BUILDRULES) - - install: default -+ $(INSTALL_LTLIB) - - install-dev: default -+ $(INSTALL_LTLIB_DEV) - - install-qa: install-dev - ---- xfsprogs-3.1.2/libxcmd/Makefile -+++ xfsprogs-3.1.2/libxcmd/Makefile -@@ -32,6 +32,12 @@ - - include $(BUILDRULES) - --install install-dev install-qa: default -+install: default -+ $(INSTALL_LTLIB) -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) -+ -+install-qa: default - - -include .dep ---- xfsprogs-3.1.2/libxfs/Makefile -+++ xfsprogs-3.1.2/libxfs/Makefile -@@ -41,7 +41,9 @@ - include $(BUILDRULES) - - install: default -+ $(INSTALL_LTLIB_ROOT) - - install-dev: default -+ $(INSTALL_LTLIB_DEV) - - install-qa: default ---- xfsprogs-3.1.2/libxlog/Makefile -+++ xfsprogs-3.1.2/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,6 +21,12 @@ - - include $(BUILDRULES) - --install install-dev install-qa: default -+install: default -+ $(INSTALL_LTLIB_ROOT) -+ -+install-dev: default -+ $(INSTALL_LTLIB_DEV) -+ -+install-qa: default - - -include .dep ---- xfsprogs-3.1.2/Makefile -+++ xfsprogs-3.1.2/Makefile -@@ -66,6 +66,8 @@ - mkfs: libxfs - quota: libxcmd - repair: libxfs libxlog -+libxlog: libxfs -+libxlog-install-dev: libxfs-install-dev - - ifneq ($(ENABLE_BLKID), yes) - mkfs: libdisk ---- xfsprogs-3.1.2/include/buildmacros -+++ xfsprogs-3.1.2/include/buildmacros -@@ -56,11 +56,13 @@ - endif - - ifeq ($(ENABLE_SHARED),yes) --INSTALL_LTLIB = \ -+_INSTALL_LTLIB = set -e; \ - cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ -- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ -- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR) -+ ../$(INSTALL) -m 755 -d $(1); \ -+ ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(1); \ -+ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(1) -+INSTALL_LTLIB_ROOT = $(call _INSTALL_LTLIB,$(PKG_ROOT_LIB_DIR)) -+INSTALL_LTLIB = $(call _INSTALL_LTLIB,$(PKG_LIB_DIR)) - endif - - # Libtool thinks the static and shared libs should be in the same dir, so -@@ -71,17 +71,9 @@ - # /usr/lib. - ifeq ($(ENABLE_SHARED),yes) - INSTALL_LTLIB_DEV = \ -- cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ -- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ -- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ -- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ -- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ -- fi -+ set -e; cd $(TOPDIR)/$(LIBNAME); \ -+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la - else - INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) - endif diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch deleted file mode 100644 index c4f794e186e2..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-3.1.8-readline.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 52548f087e9c5ff05c9f43c859114cf2066f133b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 25 Aug 2012 19:06:28 -0400 -Subject: [PATCH] libxcmd: link against readline - -This library uses readline funcs (the input.c file), so we need to link -this shared library against it. - -URL: https://bugs.gentoo.org/432644 -Reported-by: David Badia <dbadia@gmail.com> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libxcmd/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libxcmd/Makefile b/libxcmd/Makefile -index b3544f4..ce082a5 100644 ---- a/libxcmd/Makefile -+++ b/libxcmd/Makefile -@@ -22,10 +22,12 @@ endif - - ifeq ($(ENABLE_READLINE),yes) - LCFLAGS += -DENABLE_READLINE -+LTLIBS += $(LIBREADLINE) $(LIBTERMCAP) - endif - - ifeq ($(ENABLE_EDITLINE),yes) - LCFLAGS += -DENABLE_EDITLINE -+LTLIBS += $(LIBEDITLINE) $(LIBTERMCAP) - endif - - default: ltdepend $(LTLIBRARY) --- -1.7.9.7 - |