diff options
author | Michael Palimaka <kensington@gentoo.org> | 2016-01-24 06:59:30 +1100 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-01-24 07:07:17 +1100 |
commit | 79c0961c3663153ecdba57233f7154fe701aef80 (patch) | |
tree | 6a691146a7e05a705e1f7f5868619d785977f209 /dev-util/trinity/files | |
parent | sci-libs/netcdf-fortran: Version bump to 4.4.3 (diff) | |
download | gentoo-79c0961c3663153ecdba57233f7154fe701aef80.tar.gz gentoo-79c0961c3663153ecdba57233f7154fe701aef80.tar.bz2 gentoo-79c0961c3663153ecdba57233f7154fe701aef80.zip |
dev-util/trinity: remove old
Package-Manager: portage-2.2.27
Diffstat (limited to 'dev-util/trinity/files')
-rw-r--r-- | dev-util/trinity/files/trinity-1.1-flags.patch | 20 | ||||
-rw-r--r-- | dev-util/trinity/files/trinity-1.2-btrfs-headers.patch | 39 | ||||
-rw-r--r-- | dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch | 40 | ||||
-rw-r--r-- | dev-util/trinity/files/trinity-1.4-flags.patch | 20 |
4 files changed, 0 insertions, 119 deletions
diff --git a/dev-util/trinity/files/trinity-1.1-flags.patch b/dev-util/trinity/files/trinity-1.1-flags.patch deleted file mode 100644 index fd794c62dc67..000000000000 --- a/dev-util/trinity/files/trinity-1.1-flags.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- trinity-1.1/Makefile -+++ trinity-1.1/Makefile -@@ -3,7 +3,7 @@ - INSTALL_PREFIX ?= $(DESTDIR) - INSTALL_PREFIX ?= $(HOME) - --CFLAGS = -Wall -W -g -O2 -I. -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -+CFLAGS += -Wall -W -I. -Wimplicit -D_GNU_SOURCE - #CFLAGS += $(shell if $(CC) -m32 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-m32"; fi) - CFLAGS += -Wdeclaration-after-statement - CFLAGS += -Wformat=2 -@@ -49,7 +49,7 @@ - -include $(SRCS:%.c=$(DEPDIR)/%.d) - - trinity: test $(OBJS) $(HEADERS) -- $(CC) $(CFLAGS) -o trinity $(OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o trinity $(OBJS) - @mkdir -p tmp - - df = $(DEPDIR)/$(*F) diff --git a/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch b/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch deleted file mode 100644 index 81eb170fcbae..000000000000 --- a/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 2f51ba47d4e16aaa877956e2876f81ed50af5c5d Mon Sep 17 00:00:00 2001 -From: Andi Shyti <andi@etezian.org> -Date: Wed, 24 Jul 2013 12:31:05 +0200 -Subject: [PATCH] ioctls: btrfs-control: fix header inclusion order -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This patch enables newer linux/btrfs.h in Kernel headers 3.11, -where NULL is not recognized as a define. This is done by -including stdlib.h before linux/btrfs.h. It gets rid of the -following compiling error: - -In file included from ioctls/btrfs-control.c:5:0: -/usr/include/linux/btrfs.h: In function ‘btrfs_err_str’: -/usr/include/linux/btrfs.h:486:11: error: ‘NULL’ undeclared (first use in - return NULL; - ^ - -Signed-off-by: Andi Shyti <andi@etezian.org> ---- - ioctls/btrfs-control.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ioctls/btrfs-control.c b/ioctls/btrfs-control.c -index 35e5389..3b0b50a 100644 ---- a/ioctls/btrfs-control.c -+++ b/ioctls/btrfs-control.c -@@ -2,6 +2,7 @@ - - #ifdef USE_BTRFS - -+#include <stdlib.h> - #include <linux/btrfs.h> - - #include "trinity.h" --- -1.8.3.2 - diff --git a/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch b/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch deleted file mode 100644 index c7240b7c15c0..000000000000 --- a/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 54c5f3cce91ed914b1abbd3bafe4877e413947fa Mon Sep 17 00:00:00 2001 -From: Andi Shyti <andi@etezian.org> -Date: Wed, 24 Jul 2013 00:42:07 +0200 -Subject: [PATCH] ioctls: videodev2: check if defines are obsolete -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In kernel headers 3.11 the VIDIOC_DBG_G_CHIP_IDENT define is -considered obsolete, therefore removed, generating the following -compiling error: - -ioctls/videodev2.c:72:15: error: ‘VIDIOC_DBG_G_CHIP_IDENT’ undeclared here (not in a function) - IOCTL(VIDIOC_DBG_G_CHIP_IDENT), - ^ - -Check the definition of it before using it - -Signed-off-by: Andi Shyti <andi@etezian.org> ---- - ioctls/videodev2.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ioctls/videodev2.c b/ioctls/videodev2.c -index 0d1473e..03a5ae5 100644 ---- a/ioctls/videodev2.c -+++ b/ioctls/videodev2.c -@@ -69,7 +69,9 @@ static const struct ioctl videodev2_ioctls[] = { - IOCTL(VIDIOC_TRY_ENCODER_CMD), - IOCTL(VIDIOC_DBG_S_REGISTER), - IOCTL(VIDIOC_DBG_G_REGISTER), -+#ifdef VIDIOC_DBG_G_CHIP_IDENT - IOCTL(VIDIOC_DBG_G_CHIP_IDENT), -+#endif - IOCTL(VIDIOC_S_HW_FREQ_SEEK), - #ifdef VIDIOC_ENUM_DV_PRESETS - IOCTL(VIDIOC_ENUM_DV_PRESETS), --- -1.8.3.2 - diff --git a/dev-util/trinity/files/trinity-1.4-flags.patch b/dev-util/trinity/files/trinity-1.4-flags.patch deleted file mode 100644 index 5b639598044a..000000000000 --- a/dev-util/trinity/files/trinity-1.4-flags.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- trinity-1.4/Makefile -+++ trinity-1.4/Makefile -@@ -9,7 +9,7 @@ - CC := $(CROSS_COMPILE)$(CC) - LD := $(CROSS_COMPILE)$(LD) - --CFLAGS += -Wall -W -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__ -+CFLAGS += -Wall -W -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__ - ifneq ($(SYSROOT),) - CFLAGS += --sysroot=$(SYSROOT) - endif -@@ -84,7 +84,7 @@ - df = $(DEPDIR)/$(*D)/$(*F) - - %.o : %.c -- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -c $< -+ $(QUIET_CC)$(CC) $(CFLAGS) -o $@ -c $< - @mkdir -p $(DEPDIR)/$(*D) - @$(CC) -MM $(CFLAGS) $*.c > $(df).d - @mv -f $(df).d $(df).d.tmp |