Bugzilla Bug 84187

As it is, the ebuild will not work on amd64 platforms:
- configure looks for SDL in /usr/include/SDL.h,but this file is in /usr/include/SDL/
- one int/long problem in loadparts.cpp (see patch)

The attached patch and ebuild work for me

Reproducible: Always
Steps to Reproduce:
1.
2.
3.




Portage 2.0.51.19 (default-linux/amd64/2004.3, gcc-3.4.3-20050110,
glibc-2.3.4.20050125-r0, 2.6.11-gentoo-r1 x86_64)
=================================================================
System uname: 2.6.11-gentoo-r1 x86_64 AMD Athlon(tm) 64 Processor 3700+
Gentoo Base System version 1.6.9
Python:              dev-lang/python-2.3.5 [2.3.5 (#1, Mar  5 2005, 12:00:38)]
ccache version 2.3 [enabled]
dev-lang/python:     2.3.5
sys-devel/autoconf:  2.13, 2.59-r6
sys-devel/automake:  1.9.4, 1.5, 1.8.5-r3, 1.6.3, 1.7.9-r1, 1.4_p6
sys-devel/binutils:  2.15.92.0.2-r4
sys-devel/libtool:   1.5.10-r5
virtual/os-headers:  2.6.8.1-r3
ACCEPT_KEYWORDS="amd64 ~amd64"
AUTOCLEAN="yes"
CFLAGS="-march=athlon64 -O2 -pipe -fomit-frame-pointer"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.3/env
/usr/kde/3.3/share/config /usr/kde/3.3/shutdown /usr/kde/3/share/config
/usr/lib/X11/xkb /usr/lib/mozilla/defaults/pref /usr/share/config
/usr/share/texmf/dvipdfm/config/ /usr/share/texmf/dvips/config/
/usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/
/usr/share/texmf/xdvi/ /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-march=athlon64 -O2 -pipe -fomit-frame-pointer"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs autoconfig ccache distlocks sandbox"
GENTOO_MIRRORS="http://distfiles.gentoo.org
http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
LANG="fr_FR@euro"
LC_ALL="fr_FR"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://rsync.fr.gentoo.org/gentoo-portage"
USE="amd64 X aalib acpi aim alsa apache2 avi berkdb bitmap-fonts bonobo bzlib
cdb cdr crypt cups curl curlwrappers dga dio dvb dvd dvdr encode esd exif f77
fam fastcgi fftw flac font-server foomaticdb fortran ftb gb gd gdbm gif gnome
gphoto2 gpm gstreamer gtk gtk2 gtkhtml ick imagemagick imap imlib ipv6 jabber
java joystick jp2 jpeg junit kde libwww lzw lzw-tiff mad mbox mikmod mime mng
motif mozilla mpeg msn multilib nas ncurses nls nptl oggvorbis openal opengl
oscar oss pam pcmcia pcre pda pdflib perl php png posix python qt quicktime
readline recode samba scanner sdl shared sharedmem simplexml slang snmp sockets
socks5 speex spell ssl svg tcltk tcpd tetex theora tiff truetype truetype-fonts
type1-fonts unicode usb userlocales xine xinerama xml xml2 xmlrpc xmms xosd xpm
xrandr xv xvid yahoo zlib"
Unset:  ASFLAGS, CBUILD, CTARGET, LDFLAGS

Created an attachment (id=52721) [details]
The patch itself

Created an attachment (id=52722) [details]
An updated ebuild

Added amd64@g.o to CC in case one of you guys gets to it before vapier or
myself.

For the first part, the #include problem, I was debugging this in IRC with
somebody who was having that problem.  The problem actually is that the command
line for the test script has "-I -I/usr/include/SDL", where evidently the first
-I is confusing things.  I'm guessing it's adding the directory
"./-I/usr/include/SDL" to the include path list.

That came from a line in the configure script where it blindly sets CFLAGS="-I
$x_includes" and doesn't check whether $x_includes is empty.  Hilarity
ensues...

Here's my patch to address that.  Now, it really should fix configure.in, but I
don't know autotools at all (except that I recognize m4 when I see it, from my
sendmail days...).  I'll leave that to whomever is more knowledgeable.  But I
believe this is a better fix than adjusting the #include directories in the
source.

Created an attachment (id=58539) [details]
Patch to fix -I handling in CFLAGS

Also, the ebuild only applies the patch if it's on amd64... the first part,
about the #include paths, affected x86 when I tried it.  So that part needs to
be split out anyway and applied probably on all arches.

Ok, this is an updated ebuild, applying your patch, Jason (named
0.6.6-sdlinclude.patch) anytime, and modifying loadparts.cpp only on amd64

Also, I changed oggvorbis for vorbis in the USE flags (since oggvorbis is now
deprecated), is ogg USE flag also needed? It is only there to download and use
some Ogg vorbis files in game.

Created an attachment (id=58689) [details]
Updated cannonsmash-0.6.6-r1.ebuild

Use with the -I handling patch named as 0.6.6-sdlinclude.patch

the proper fix is to type case 0 to (size_t)

added to portage