summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2003-10-11 19:58:09 +0000
committerTim Yamin <plasmaroo@gentoo.org>2003-10-11 19:58:09 +0000
commit56588cc590a116a220a8d24c8451f401df1571b1 (patch)
tree55ee683c6abd10ec76064d319351d979eeb21a2b
parentMasked SLOT'd ruby-1.6 and ruby-1.8 (diff)
downloadhistorical-56588cc590a116a220a8d24c8451f401df1571b1.tar.gz
historical-56588cc590a116a220a8d24c8451f401df1571b1.tar.bz2
historical-56588cc590a116a220a8d24c8451f401df1571b1.zip
Added GCC 3.3 patches: Bug 30891...
-rw-r--r--sys-kernel/xfs-sources/ChangeLog6
-rw-r--r--sys-kernel/xfs-sources/Manifest17
-rw-r--r--sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20_pre62
-rw-r--r--sys-kernel/xfs-sources/files/xfs-sources-2.4.20-gcc33.patch245
-rw-r--r--sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild4
-rw-r--r--sys-kernel/xfs-sources/xfs-sources-2.4.20_pre6.ebuild67
6 files changed, 261 insertions, 80 deletions
diff --git a/sys-kernel/xfs-sources/ChangeLog b/sys-kernel/xfs-sources/ChangeLog
index 31a494248a42..9f7c39b74cb9 100644
--- a/sys-kernel/xfs-sources/ChangeLog
+++ b/sys-kernel/xfs-sources/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-kernel/xfs-sources
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.25 2003/09/07 18:53:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.26 2003/10/11 19:58:02 plasmaroo Exp $
+
+ 11 Oct 2003; <plasmaroo@gentoo.org> xfs-sources-2.4.20-r3.ebuild,
+ xfs-sources-2.4.20_pre6.ebuild, files/xfs-sources-2.4.20-gcc33.patch:
+ Added GCC 3.3 patches: Bug 30891.
08 Sep 2003; Martin Holzer <mholzer@gentoo.org>
xfs-sources-2.4.19-r2.ebuild, xfs-sources-2.4.20-r1.ebuild,
diff --git a/sys-kernel/xfs-sources/Manifest b/sys-kernel/xfs-sources/Manifest
index 03ce01ec26d7..36636cb8a5a0 100644
--- a/sys-kernel/xfs-sources/Manifest
+++ b/sys-kernel/xfs-sources/Manifest
@@ -1,14 +1,13 @@
-MD5 2e9692ad3110cbf7a408684a123620bd ChangeLog 7387
+MD5 7ccf198325fe41893eaa9962726e523b ChangeLog 7566
MD5 4fa4fca3767bc89c7c258ac3c382fc18 xfs-sources-2.4.19-r2.ebuild 1844
-MD5 4daa3597c62a9676fad4a07e543be9c3 xfs-sources-2.4.20-r1.ebuild 2132
-MD5 03830a0019c2793faccebaf4de544435 xfs-sources-2.4.20-r2.ebuild 2131
-MD5 b9efc1d02237e65b24cc38844918b3d8 xfs-sources-2.4.20-r3.ebuild 2131
MD5 b2fb282b21e82e7cac47f99c48017e54 xfs-sources-2.4.20.ebuild 2142
-MD5 a36a82c55072145a585bd38c886e3ccc xfs-sources-2.4.20_pre6.ebuild 2147
+MD5 03830a0019c2793faccebaf4de544435 xfs-sources-2.4.20-r2.ebuild 2131
+MD5 4daa3597c62a9676fad4a07e543be9c3 xfs-sources-2.4.20-r1.ebuild 2132
+MD5 7721ef109f2d111f961afe47a3baa0d9 xfs-sources-2.4.20-r3.ebuild 2185
+MD5 b0c3e68e37892be35fc1c33723bbbdc3 files/xfs-sources-2.4.19.patch 497
+MD5 6c7dc3e61cee85185b45bc82e2982351 files/digest-xfs-sources-2.4.20-r2 142
+MD5 bb367b087129027dd816740e61f0e675 files/digest-xfs-sources-2.4.20-r1 142
MD5 77f3799264c87379da9f7f2b23f20684 files/digest-xfs-sources-2.4.19-r2 142
MD5 a728d28dca69f5ae16aab56cd2fc6110 files/digest-xfs-sources-2.4.20 139
-MD5 bb367b087129027dd816740e61f0e675 files/digest-xfs-sources-2.4.20-r1 142
-MD5 6c7dc3e61cee85185b45bc82e2982351 files/digest-xfs-sources-2.4.20-r2 142
+MD5 ec7765fb708912e448a36dc6cf7cdce9 files/xfs-sources-2.4.20-gcc33.patch 11801
MD5 739cbda7c5acadb95758e2f4d8194699 files/digest-xfs-sources-2.4.20-r3 142
-MD5 e04fdca46eeb0079890c1667f0059d65 files/digest-xfs-sources-2.4.20_pre6 144
-MD5 b0c3e68e37892be35fc1c33723bbbdc3 files/xfs-sources-2.4.19.patch 497
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20_pre6 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20_pre6
deleted file mode 100644
index 16165c8cd583..000000000000
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20_pre6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 f737ae6154fcbead8d84c020c2734ef0 patches-2.4.20-xfs_pre6.tar.bz2 3262742
diff --git a/sys-kernel/xfs-sources/files/xfs-sources-2.4.20-gcc33.patch b/sys-kernel/xfs-sources/files/xfs-sources-2.4.20-gcc33.patch
new file mode 100644
index 000000000000..9090fbb4e67e
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/xfs-sources-2.4.20-gcc33.patch
@@ -0,0 +1,245 @@
+diff -u -r linux-2.4.20-xfs-r3/arch/arm/mach-integrator/pci_v3.c linux-2.4.20-xfs-r4/arch/arm/mach-integrator/pci_v3.c
+--- linux-2.4.20-xfs-r3/arch/arm/mach-integrator/pci_v3.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/arch/arm/mach-integrator/pci_v3.c 2003-10-11 11:42:28.000000000 +0200
+@@ -629,7 +629,6 @@
+ #if 0
+ ret = request_irq(IRQ_LBUSTIMEOUT, lb_timeout, 0, "bus timeout", NULL);
+ if (ret)
+- printk(KERN_ERR "PCI: unable to grab local bus timeout ".
+- "interrupt: %d\n", ret);
++ printk(KERN_ERR "PCI: unable to grab local bus timeout interrupt: %d\n", ret);
+ #endif
+ }
+diff -u -r linux-2.4.20-xfs-r3/arch/i386/math-emu/poly.h linux-2.4.20-xfs-r4/arch/i386/math-emu/poly.h
+--- linux-2.4.20-xfs-r3/arch/i386/math-emu/poly.h 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/arch/i386/math-emu/poly.h 2003-10-11 11:59:17.000000000 +0200
+@@ -75,11 +75,11 @@
+ /* Add the 12 byte Xsig x2 to Xsig dest, with no checks for overflow. */
+ static inline void add_Xsig_Xsig(Xsig *dest, const Xsig *x2)
+ {
+- asm volatile ("movl %1,%%edi; movl %2,%%esi;
+- movl (%%esi),%%eax; addl %%eax,(%%edi);
+- movl 4(%%esi),%%eax; adcl %%eax,4(%%edi);
+- movl 8(%%esi),%%eax; adcl %%eax,8(%%edi);"
+- :"=g" (*dest):"g" (dest), "g" (x2)
++ asm volatile ("movl %1,%%edi; movl %2,%%esi; " \
++ "movl (%%esi),%%eax; addl %%eax,(%%edi); " \
++ "movl 4(%%esi),%%eax; adcl %%eax,4(%%edi); " \
++ "movl 8(%%esi),%%eax; adcl %%eax,8(%%edi); " \
++ :"=g" (*dest):"g" (dest), "g" (x2) \
+ :"ax","si","di");
+ }
+
+@@ -90,18 +90,18 @@
+ problem, but keep fingers crossed! */
+ static inline void add_two_Xsig(Xsig *dest, const Xsig *x2, long int *exp)
+ {
+- asm volatile ("movl %2,%%ecx; movl %3,%%esi;
+- movl (%%esi),%%eax; addl %%eax,(%%ecx);
+- movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx);
+- movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx);
+- jnc 0f;
+- rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx)
+- movl %4,%%ecx; incl (%%ecx)
+- movl $1,%%eax; jmp 1f;
+- 0: xorl %%eax,%%eax;
+- 1:"
+- :"=g" (*exp), "=g" (*dest)
+- :"g" (dest), "g" (x2), "g" (exp)
++ asm volatile ("movl %2,%%ecx; movl %3,%%esi; " \
++ "movl (%%esi),%%eax; addl %%eax,(%%ecx); " \
++ "movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx); " \
++ "movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx); " \
++ "jnc 0f; " \
++ "rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx); " \
++ "movl %4,%%ecx; incl (%%ecx); " \
++ "movl $1,%%eax; jmp 1f; " \
++ "0: xorl %%eax,%%eax; " \
++ "1: " \
++ :"=g" (*exp), "=g" (*dest) \
++ :"g" (dest), "g" (x2), "g" (exp) \
+ :"cx","si","ax");
+ }
+
+diff -u -r linux-2.4.20-xfs-r3/arch/mips64/mm/r4xx0.c linux-2.4.20-xfs-r4/arch/mips64/mm/r4xx0.c
+--- linux-2.4.20-xfs-r3/arch/mips64/mm/r4xx0.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/arch/mips64/mm/r4xx0.c 2003-10-11 11:44:44.000000000 +0200
+@@ -1941,9 +1941,8 @@
+ #ifdef DEBUG_TLB
+ if((pid != (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff)) ||
+ (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) == 0)) {
+- printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d
+- tlbpid=%d\n", (int) (CPU_CONTEXT(smp_processor_id(),
+- vma->vm_mm) & 0xff), pid);
++ printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d tlbpid=%d\n",
++ (int) (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff), pid);
+ }
+ #endif
+
+diff -u -r linux-2.4.20-xfs-r3/arch/mips64/mm/tlb-r4k.c linux-2.4.20-xfs-r4/arch/mips64/mm/tlb-r4k.c
+--- linux-2.4.20-xfs-r3/arch/mips64/mm/tlb-r4k.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/arch/mips64/mm/tlb-r4k.c 2003-10-11 11:45:46.000000000 +0200
+@@ -200,9 +200,8 @@
+ #ifdef DEBUG_TLB
+ if((pid != (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff)) ||
+ (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) == 0)) {
+- printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d
+- tlbpid=%d\n", (int) (CPU_CONTEXT(smp_processor_id(),
+- vma->vm_mm) & 0xff), pid);
++ printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d tlbpid=%d\n",
++ (int) (CPU_CONTEXT(smp_processor_id(), vma->vm_mm) & 0xff), pid);
+ }
+ #endif
+
+diff -u -r linux-2.4.20-xfs-r3/drivers/atm/zatm.c linux-2.4.20-xfs-r4/drivers/atm/zatm.c
+--- linux-2.4.20-xfs-r3/drivers/atm/zatm.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/atm/zatm.c 2003-10-11 11:46:52.000000000 +0200
+@@ -1430,8 +1430,7 @@
+ zout(uPD98401_GMR_ONE | uPD98401_BURST8 | uPD98401_BURST4 |
+ uPD98401_BURST2 | uPD98401_GMR_PM | uPD98401_GMR_DR,GMR);
+ /* TODO: should shrink allocation now */
+- printk("mem=%dkB,%s (",zatm_dev->mem >> 10,zatm_dev->copper ? "UTP" :
+- "MMF");
++ printk("mem=%dkB,%s (",zatm_dev->mem >> 10,zatm_dev->copper ? "UTP" : "MMF");
+ for (i = 0; i < ESI_LEN; i++)
+ printk("%02X%s",dev->esi[i],i == ESI_LEN-1 ? ")\n" : "-");
+ do {
+diff -u -r linux-2.4.20-xfs-r3/drivers/char/h8.c linux-2.4.20-xfs-r4/drivers/char/h8.c
+--- linux-2.4.20-xfs-r3/drivers/char/h8.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/char/h8.c 2003-10-11 11:47:16.000000000 +0200
+@@ -574,8 +574,7 @@
+ }
+
+ if (intrbuf.word & H8_POWER_BUTTON) {
+- printk(KERN_CRIT "Power switch pressed - please wait - preparing to power
+-off\n");
++ printk(KERN_CRIT "Power switch pressed - please wait - preparing to power off\n");
+ h8_set_event_mask(H8_POWER_BUTTON);
+ wake_up(&h8_monitor_wait);
+ }
+diff -u -r linux-2.4.20-xfs-r3/drivers/ide/ide-cd.h linux-2.4.20-xfs-r4/drivers/ide/ide-cd.h
+--- linux-2.4.20-xfs-r3/drivers/ide/ide-cd.h 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/ide/ide-cd.h 2003-10-11 11:47:59.000000000 +0200
+@@ -438,7 +438,7 @@
+
+ byte curlba[3];
+ byte nslots;
+- __u8 short slot_tablelen;
++ __u16 slot_tablelen;
+ };
+
+
+diff -u -r linux-2.4.20-xfs-r3/drivers/net/bcm4400/b44.h linux-2.4.20-xfs-r4/drivers/net/bcm4400/b44.h
+--- linux-2.4.20-xfs-r3/drivers/net/bcm4400/b44.h 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/net/bcm4400/b44.h 2003-10-11 11:48:41.000000000 +0200
+@@ -1079,10 +1079,10 @@
+ /******************************************************************************/
+
+ #define REG_RD(pDevice, OffsetName) \
+- __raw_readl(&((pDevice)->pMemView->##OffsetName))
++ __raw_readl(&((pDevice)->pMemView->OffsetName))
+
+ #define REG_WR(pDevice, OffsetName, Value32) \
+- (void) __raw_writel(Value32, &((pDevice)->pMemView->##OffsetName))
++ (void) __raw_writel(Value32, &((pDevice)->pMemView->OffsetName))
+
+ #define REG_RD_OFFSET(pDevice, Offset) \
+ __raw_readl(((LM_UINT8 *) (pDevice)->pMemView + Offset))
+diff -u -r linux-2.4.20-xfs-r3/drivers/net/fealnx.c linux-2.4.20-xfs-r4/drivers/net/fealnx.c
+--- linux-2.4.20-xfs-r3/drivers/net/fealnx.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/net/fealnx.c 2003-10-11 11:54:07.000000000 +0200
+@@ -937,7 +937,7 @@
+ // 89/9/1 modify,
+ // np->bcrvalue=0x38;
+ np->bcrvalue = 0x10;
+- np->cralue = 0xe00; /* rx 128 burst length */
++ np->crvalue = 0xe00; /* rx 128 burst length */
+ #warning Processor architecture undefined!
+ #endif
+ // 89/12/29 add,
+@@ -1198,7 +1198,6 @@
+ printk("\n");
+ }
+
+- + dev->if_port = np->default_port;
+ /* Reinit. Gross */
+
+ /* Reset the chip's Tx and Rx processes. */
+diff -u -r linux-2.4.20-xfs-r3/drivers/net/irda/ma600.c linux-2.4.20-xfs-r4/drivers/net/irda/ma600.c
+--- linux-2.4.20-xfs-r3/drivers/net/irda/ma600.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/net/irda/ma600.c 2003-10-11 11:55:09.000000000 +0200
+@@ -53,7 +53,7 @@
+ if(!(expr)) { \
+ printk( "Assertion failed! %s,%s,%s,line=%d\n",\
+ #expr,__FILE__,__FUNCTION__,__LINE__); \
+- ##func}
++ func}
+ #endif
+
+ /* convert hex value to ascii hex */
+diff -u -r linux-2.4.20-xfs-r3/drivers/net/tokenring/olympic.c linux-2.4.20-xfs-r4/drivers/net/tokenring/olympic.c
+--- linux-2.4.20-xfs-r3/drivers/net/tokenring/olympic.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/net/tokenring/olympic.c 2003-10-11 11:49:21.000000000 +0200
+@@ -655,8 +655,8 @@
+ printk(" stat_ring[7]: %p\n", &(olympic_priv->olympic_rx_status_ring[7]) );
+
+ printk("RXCDA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCDA),&olympic_priv->olympic_rx_ring[0]);
+- printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr =
+-%08x\n",olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ;
++ printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr = %08x\n",
++ olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ;
+ #endif
+
+ writew((((readw(olympic_mmio+RXENQ)) & 0x8000) ^ 0x8000) | i,olympic_mmio+RXENQ);
+diff -u -r linux-2.4.20-xfs-r3/drivers/scsi/sun3_NCR5380.c linux-2.4.20-xfs-r4/drivers/scsi/sun3_NCR5380.c
+--- linux-2.4.20-xfs-r3/drivers/scsi/sun3_NCR5380.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/drivers/scsi/sun3_NCR5380.c 2003-10-11 11:50:00.000000000 +0200
+@@ -1226,8 +1226,7 @@
+ BASR_ACK)) ==
+ (BASR_PHASE_MATCH | BASR_ACK)) {
+ printk("scsi%d: BASR %02x\n", HOSTNO, NCR5380_read(BUS_AND_STATUS_REG));
+- printk("scsi%d: bus stuck in data phase -- probably a
+- single byte overrun!\n", HOSTNO);
++ printk("scsi%d: bus stuck in data phase -- probably a single byte overrun!\n", HOSTNO);
+ printk("not prepared for this error!\n");
+ printk("please e-mail sammy@sammy.net with a description of how this\n");
+ printk("error was produced.\n");
+diff -u -r linux-2.4.20-xfs-r3/fs/reiserfs/super.c linux-2.4.20-xfs-r4/fs/reiserfs/super.c
+--- linux-2.4.20-xfs-r3/fs/reiserfs/super.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/fs/reiserfs/super.c 2003-10-11 11:51:48.000000000 +0200
+@@ -941,8 +941,8 @@
+ ll_rw_block(READ, 1, &(SB_AP_BITMAP(s)[i].bh)) ;
+ wait_on_buffer(SB_AP_BITMAP(s)[i].bh) ;
+ if (!buffer_uptodate(SB_AP_BITMAP(s)[i].bh)) {
+- printk("reread_meta_blocks, error reading bitmap block number %d at
+- %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
++ printk("reread_meta_blocks, error reading bitmap block number %d at %ld\n",
++ i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
+ return 1 ;
+ }
+ }
+diff -u -r linux-2.4.20-xfs-r3/net/core/rtnetlink.c linux-2.4.20-xfs-r4/net/core/rtnetlink.c
+--- linux-2.4.20-xfs-r3/net/core/rtnetlink.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/net/core/rtnetlink.c 2003-10-11 11:52:25.000000000 +0200
+@@ -394,7 +394,7 @@
+ * Malformed skbs with wrong lengths of messages are discarded silently.
+ */
+
+-extern __inline__ int rtnetlink_rcv_skb(struct sk_buff *skb)
++__inline__ int rtnetlink_rcv_skb(struct sk_buff *skb)
+ {
+ int err;
+ struct nlmsghdr * nlh;
+diff -u -r linux-2.4.20-xfs-r3/net/decnet/dn_table.c linux-2.4.20-xfs-r4/net/decnet/dn_table.c
+--- linux-2.4.20-xfs-r3/net/decnet/dn_table.c 2003-10-11 11:38:33.000000000 +0200
++++ linux-2.4.20-xfs-r4/net/decnet/dn_table.c 2003-10-11 11:52:48.000000000 +0200
+@@ -836,8 +836,7 @@
+ return NULL;
+
+ if (in_interrupt() && net_ratelimit()) {
+- printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table
+-from interrupt\n");
++ printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table from interrupt\n");
+ return NULL;
+ }
+ if ((t = kmalloc(sizeof(struct dn_fib_table), GFP_KERNEL)) == NULL)
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild
index c6d2a825a0e1..d6e7bf618c85 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild,v 1.5 2003/09/07 18:53:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild,v 1.6 2003/10/11 19:58:02 plasmaroo Exp $
IUSE="build crypt"
@@ -64,4 +64,6 @@ src_unpack() {
fi
kernel_src_unpack
+ epatch ${FILESDIR}/xfs-sources-2.4.20-gcc33.patch
+
}
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20_pre6.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20_pre6.ebuild
deleted file mode 100644
index 42257af4f971..000000000000
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20_pre6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20_pre6.ebuild,v 1.6 2003/09/07 18:53:16 mholzer Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version. They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*). Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel
-OKV=2.4.20
-EXTRAVERSION=-${P/-sources-2.4.20}
-KV=${OKV}${EXTRAVERSION}
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
- mirror://gentoo/patches-${KV}.tar.bz2"
-KEYWORDS="x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
- unpack ${A}
- mv linux-${OKV} linux-${KV} || die
-
- cd ${KV}
- # Kill patches we aren't suppposed to use, don't worry about
- # failures, if they aren't there that is a good thing!
-
- # If the compiler isn't gcc3 drop the gcc3 patches
- if [[ "${COMPILER}" == "gcc3" ]];then
- einfo "You are using gcc3, check out the special"
- einfo "processor types just for you"
- else
- einfo "Your compiler is not gcc3, dropping patches..."
- for file in *gcc3*;do
- einfo "Dropping ${file}..."
- rm -f ${file}
- done
- fi
-
- # This is the ratified crypt USE flag, enables IPSEC and patch-int
- if [ -z "`use crypt`" ]; then
- einfo "No Cryptographic support, dropping patches..."
- for file in 8*;do
- einfo "Dropping ${file}..."
- rm -f ${file}
- done
- else
- einfo "Cryptographic support enabled..."
- fi
-
- kernel_src_unpack
-}