[gentoo-dev] re: iproute2-2.2.4-r3.ebuild merge problems (FIX!!)

[Martin Schlemmer]

hi

sorry, bit too eager sometimes ;-)
here is the diff for the .ebuild

iproute2-2.2.4-r3.ebuild.diff:
--------------------------------cut here----------------------------
*** iproute2-2.2.4-r3.ebuild.orig	Tue Sep 18 01:40:19 2001
--- iproute2-2.2.4-r3.ebuild	Tue Sep 18 01:40:23 2001
***************
*** 26,31 ****
--- 26,35 ----
  #   #this next thing is required to enable diffserv (ATM support
doesn't compile right now)
  #   cp Config Config.orig
  #   sed -e 's/DIFFSERV=n/DIFFSERV=y/g' Config.orig > Config
+ 
+     # patch the Makefile to fix compile problems for some systems
+     cd ${S}
+     patch -p0 < ${FILESDIR}/Makefile.diff || die
  }
  
  src_compile() {
--------------------------------cut here--------------------------


also as attachment (some lines too long for my mail client (same as with
the Makefile.diff)

greetings
MS

On Tue, 2001-09-18 at 01:36, Martin Schlemmer wrote:
> hi
>
> ok, i traced the problem.
>
> on my system for some reason, if KERNEL_INCLUDE in the Makefile is set
> to "/usr/include", it give the errors.  if it is set to
> "/usr/src/linux/include", it works.  but since we dont want linux-source
> as dependancy of iproute2, this cant be.
>
> so after a bit of trial and error, i found it is the order of the -I's
> that cause the problem.
>
> the following patch if applied before compilation should fix the
> problem:
>
> Makefile.diff:
> ----------------------cut here----------------------------
>
> *** Makefile.orig	Tue Sep 18 01:23:48 2001
> --- Makefile	Tue Sep 18 01:24:33 2001
> ***************
> *** 30,36 ****
>   endif
>
>   CC=gcc
> ! CFLAGS=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g $(GLIBCFIX)
> -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
>
>   LDLIBS += -L../lib -lnetlink -lutil
>
> --- 30,36 ----
>   endif
>
>   CC=gcc
> ! CFLAGS=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g $(GLIBCFIX)
> -I../include $(DEFINES) -I$(KERNEL_INCLUDE)
>
>   LDLIBS += -L../lib -lnetlink -lutil
> -------------------cut here-------------------------------
>
>
> i also made a attachment.
>
> greetings
> MS
>