84187 2005-03-05 06:08 0000 Fix for games-simulation/cannonsmash-0.6.6 on amd64 2005-05-12 19:06:57 0000 1 1 1 Unclassified Gentoo Linux Games unspecified AMD64 Linux RESOLVED FIXED P2 enhancement --- 1 voyageur@gentoo.org games@gentoo.org amd64@gentoo.org jbucata@tulsaconnect.com voyageur@gentoo.org 2005-03-05 06:08:19 0000 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 voyageur@gentoo.org 2005-03-05 06:09:03 0000 Created an attachment (id=52721) The patch itself voyageur@gentoo.org 2005-03-05 06:09:56 0000 Created an attachment (id=52722) An updated ebuild wolf31o2@gentoo.org 2005-03-05 07:02:25 0000 Added amd64@g.o to CC in case one of you guys gets to it before vapier or myself. jbucata@tulsaconnect.com 2005-05-09 23:13:49 0000 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. jbucata@tulsaconnect.com 2005-05-09 23:15:57 0000 Created an attachment (id=58539) Patch to fix -I handling in CFLAGS jbucata@tulsaconnect.com 2005-05-09 23:21:51 0000 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. voyageur@gentoo.org 2005-05-11 14:18:49 0000 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. voyageur@gentoo.org 2005-05-11 14:23:31 0000 Created an attachment (id=58689) Updated cannonsmash-0.6.6-r1.ebuild Use with the -I handling patch named as 0.6.6-sdlinclude.patch vapier@gentoo.org 2005-05-12 19:06:57 0000 the proper fix is to type case 0 to (size_t) added to portage 52721 2005-03-05 06:09 0000 The patch itself 0.6.6-amd64.patch text/plain LS0tIGNvbmZpZ3VyZS5vcmlnCTIwMDUtMDMtMDUgMTQ6NDA6MTguMDAwMDAwMDAwICswMTAwCisr KyBjb25maWd1cmUJMjAwNS0wMy0wNSAxNDowNTo1OC4wMDAwMDAwMDAgKzAxMDAKQEAgLTY0OTQs NyArNjQ5NCw3IEBACiAjaW5jbHVkZSA8c3RkaW8uaD4KICNpbmNsdWRlIDxzdGRsaWIuaD4KICNp bmNsdWRlIDxzdHJpbmcuaD4KLSNpbmNsdWRlICJTREwuaCIKKyNpbmNsdWRlICJTREwvU0RMLmgi CiAKIGNoYXIqCiBteV9zdHJkdXAgKGNoYXIgKnN0cikKQEAgLTY2MDMsNyArNjYwMyw3IEBACiAv KiBlbmQgY29uZmRlZnMuaC4gICovCiAKICNpbmNsdWRlIDxzdGRpby5oPgotI2luY2x1ZGUgIlNE TC5oIgorI2luY2x1ZGUgIlNETC9TREwuaCIKIAogaW50CiBtYWluICgpCi0tLSBsb2FkcGFydHMu Y3BwLm9yaWcJMjAwNS0wMy0wNSAxNDo0MDo0OC4wMDAwMDAwMDAgKzAxMDAKKysrIGxvYWRwYXJ0 cy5jcHAJMjAwNS0wMy0wNSAxNDozNDo1Ny4wMDAwMDAwMDAgKzAxMDAKQEAgLTI0NSw3ICsyNDUs NyBAQAogCiAJd2hpbGUgKCdcXCcgPT0gbGluZVtsLTFdKSB7CiAgICAgICAgICAgICAvLyBjb25j YXQgbmV4dCBsaW5lKHMpCi0JICAgIGludCBidWZzaXplID0gY2xhbXAoMFUsIHNpemVvZihsaW5l KS1sLCBzaXplb2YobGluZSktMSk7CisJICAgIGludCBidWZzaXplID0gY2xhbXAoMExVLCBzaXpl b2YobGluZSktbCwgc2l6ZW9mKGxpbmUpLTEpOwogCSAgICBmZ2V0cygmbGluZVtsLTJdLCBidWZz aXplLCBmcCk7CiAJICAgIGlmIChmZW9mKChGSUxFKilmcCkpIGJyZWFrOwogCSAgICBsID0gc3Ry bGVuKGxpbmUpOwo= 52722 2005-03-05 06:09 0000 An updated ebuild cannonsmash-0.6.6-r1.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA0IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L2dhbWVzLXNpbXVsYXRpb24vY2Fubm9uc21hc2gv Y2Fubm9uc21hc2gtMC42LjYuZWJ1aWxkLHYgMS42IDIwMDQvMTIvMTYgMTU6NTU6NDMgam9zZWp4 IEV4cCAkCgppbmhlcml0IGdhbWVzCgpNWV9PR0c9ZGFuc2xhdHJpc3Rlc3NlMi00OC5vZ2cKREVT Q1JJUFRJT049IjNEIHRhYmxldGVubmlzIGdhbWUiCkhPTUVQQUdFPSJodHRwOi8vY2Fubm9uc21h c2guc291cmNlZm9yZ2UubmV0LyIKU1JDX1VSST0ibWlycm9yOi8vc291cmNlZm9yZ2UvY2Fubm9u c21hc2gvY3NtYXNoLSR7UFZ9LnRhci5negoJb2dndm9yYmlzPyAoIGh0dHA6Ly9uYW4ucC51dG1j Lm9yLmpwLyR7TVlfT0dHfSApIgoKTElDRU5TRT0iR1BMLTIiClNMT1Q9IjAiCktFWVdPUkRTPSJ4 ODYgcHBjIH5hbWQ2NCIKSVVTRT0ib2dndm9yYmlzIG5scyIKClJERVBFTkQ9InZpcnR1YWwvbGli YwoJdmlydHVhbC94MTEKCXZpcnR1YWwvb3BlbmdsCgk+PW1lZGlhLWxpYnMvbGlic2RsLTEuMi40 Cgk+PW1lZGlhLWxpYnMvc2RsLW1peGVyLTEuMi4zCgk+PW1lZGlhLWxpYnMvc2RsLWltYWdlLTEu Mi4yCgk9eDExLWxpYnMvZ3RrKy0xLjIqIgpERVBFTkQ9IiR7UkRFUEVORH0KCW9nZ3ZvcmJpcz8g KCA+PXN5cy1hcHBzL3NlZC00ICkiCgpTPSIke1dPUktESVJ9L2NzbWFzaC0ke1BWfSIKCnNyY191 bnBhY2soKSB7Cgl1bnBhY2sgY3NtYXNoLSR7UFZ9LnRhci5negoJY2QgIiR7U30iCglpZiB1c2Ug YW1kNjQ7IHRoZW4KCQllcGF0Y2ggJHtGSUxFU0RJUn0vJHtQVn0tYW1kNjQucGF0Y2gKCWZpCglp ZiB1c2Ugb2dndm9yYmlzIDsgdGhlbgoJCWNwICIke0RJU1RESVJ9LyR7TVlfT0dHfSIgIiR7U30v IiB8fCBkaWUgImNwIGZhaWxlZCIKCQlzZWQgLWkgXAoJCQktZSAiczoke01ZX09HR306JHtHQU1F U19EQVRBRElSfS9jc21hc2gvJHtNWV9PR0d9OiIgdHRpbmMuaCBcCgkJCXx8IGRpZSAic2V0dGlu ZyBvZ2cgbG9jIgoJZmkKfQoKc3JjX2NvbXBpbGUoKSB7CgllZ2FtZXNjb25mIFwKCQkkKHVzZV9l bmFibGUgbmxzKSBcCgkJLS1kYXRhZGlyPSIke0dBTUVTX0RBVEFESVJfQkFTRX0iIFwKCQl8fCBk aWUKCWVtYWtlIFwKCQlsb2NhbGVkaXI9Ii91c3Ivc2hhcmUiIFwKCQl8fCBkaWUgImVtYWtlIGZh aWxlZCIKfQoKc3JjX2luc3RhbGwoKSB7CgltYWtlIERFU1RESVI9IiR7RH0iIGluc3RhbGwgfHwg ZGllICJtYWtlIGluc3RhbGwgZmFpbGVkIgoJaWYgdXNlIG9nZ3ZvcmJpcyA7IHRoZW4KCQlpbnNp bnRvICIke0dBTUVTX0RBVEFESVJ9L2NzbWFzaCIKCQlkb2lucyAiJHtNWV9PR0d9IgoJZmkKCWRv ZG9jIEFVVEhPUlMgQ1JFRElUUyBSRUFETUUqCglwcmVwZ2FtZXNkaXJzCn0K 58539 2005-05-09 23:15 0000 Patch to fix -I handling in CFLAGS sdl.patch text/plain LS0tIG9yaWdfY29uZmlndXJlCTIwMDUtMDUtMDkgMjM6NTg6NTUuNzI1MjU0MDk0IC0wNTAwCisr KyBjb25maWd1cmUJMjAwNS0wNS0xMCAwMDowMjoxNS4zMDIxMzY2MzMgLTA1MDAKQEAgLTU1MTUs NyArNTUxNSwxMSBAQAogZmkKIAogCi1DRkxBR1M9Ii1JICR4X2luY2x1ZGVzIgoraWYgdGVzdCAi eCR4X2luY2x1ZGVzIiAhPSAieCI7IHRoZW4KKyAgQ0ZMQUdTPSItSSAkeF9pbmNsdWRlcyIKK2Vs c2UKKyAgQ0ZMQUdTPSIiCitmaQogTERGTEFHUz0iLUwvdXNyL2xvY2FsL2xpYiAtTCR4X2xpYnJh cmllcyAtTCRsaWJkaXIiCiBDWFhGTEFHUz0iJENGTEFHUyAtV2FsbCIKIAo= 58689 2005-05-11 14:23 0000 Updated cannonsmash-0.6.6-r1.ebuild cannonsmash-0.6.6-r1.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA0IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L2dhbWVzLXNpbXVsYXRpb24vY2Fubm9uc21hc2gv Y2Fubm9uc21hc2gtMC42LjYuZWJ1aWxkLHYgMS42IDIwMDQvMTIvMTYgMTU6NTU6NDMgam9zZWp4 IEV4cCAkCgppbmhlcml0IGdhbWVzCgpNWV9PR0c9ZGFuc2xhdHJpc3Rlc3NlMi00OC5vZ2cKREVT Q1JJUFRJT049IjNEIHRhYmxldGVubmlzIGdhbWUiCkhPTUVQQUdFPSJodHRwOi8vY2Fubm9uc21h c2guc291cmNlZm9yZ2UubmV0LyIKU1JDX1VSST0ibWlycm9yOi8vc291cmNlZm9yZ2UvY2Fubm9u c21hc2gvY3NtYXNoLSR7UFZ9LnRhci5negoJdm9yYmlzPyAoIGh0dHA6Ly9uYW4ucC51dG1jLm9y LmpwLyR7TVlfT0dHfSApIgoKTElDRU5TRT0iR1BMLTIiClNMT1Q9IjAiCktFWVdPUkRTPSJ4ODYg cHBjIH5hbWQ2NCIKSVVTRT0idm9yYmlzIG5scyIKClJERVBFTkQ9InZpcnR1YWwvbGliYwoJdmly dHVhbC94MTEKCXZpcnR1YWwvb3BlbmdsCgk+PW1lZGlhLWxpYnMvbGlic2RsLTEuMi40Cgk+PW1l ZGlhLWxpYnMvc2RsLW1peGVyLTEuMi4zCgk+PW1lZGlhLWxpYnMvc2RsLWltYWdlLTEuMi4yCgk9 eDExLWxpYnMvZ3RrKy0xLjIqIgpERVBFTkQ9IiR7UkRFUEVORH0KCXZvcmJpcz8gKCA+PXN5cy1h cHBzL3NlZC00ICkiCgpTPSIke1dPUktESVJ9L2NzbWFzaC0ke1BWfSIKCnNyY191bnBhY2soKSB7 Cgl1bnBhY2sgY3NtYXNoLSR7UFZ9LnRhci5negoJY2QgIiR7U30iCgllcGF0Y2ggJHtGSUxFU0RJ Un0vJHtQVn0tc2RsaW5jbHVkZS5wYXRjaAoJaWYgdXNlIGFtZDY0OyB0aGVuCgkJc2VkIC1pICdz L2J1ZnNpemUgPSBjbGFtcCgwVSwgc2l6ZW9mKGxpbmUpLWwsIHNpemVvZihsaW5lKS0xKS9idWZz aXplID0gY2xhbXAoMExVLCBzaXplb2YobGluZSktbCwgc2l6ZW9mKGxpbmUpLTEpLycgbG9hZHBh cnRzLmNwcAoJZmkKCWlmIHVzZSB2b3JiaXMgOyB0aGVuCgkJY3AgIiR7RElTVERJUn0vJHtNWV9P R0d9IiAiJHtTfS8iIHx8IGRpZSAiY3AgZmFpbGVkIgoJCXNlZCAtaSBcCgkJCS1lICJzOiR7TVlf T0dHfToke0dBTUVTX0RBVEFESVJ9L2NzbWFzaC8ke01ZX09HR306IiB0dGluYy5oIFwKCQkJfHwg ZGllICJzZXR0aW5nIG9nZyBsb2MiCglmaQp9CgpzcmNfY29tcGlsZSgpIHsKCWVnYW1lc2NvbmYg XAoJCSQodXNlX2VuYWJsZSBubHMpIFwKCQktLWRhdGFkaXI9IiR7R0FNRVNfREFUQURJUl9CQVNF fSIgXAoJCXx8IGRpZQoJZW1ha2UgXAoJCWxvY2FsZWRpcj0iL3Vzci9zaGFyZSIgXAoJCXx8IGRp ZSAiZW1ha2UgZmFpbGVkIgp9CgpzcmNfaW5zdGFsbCgpIHsKCW1ha2UgREVTVERJUj0iJHtEfSIg aW5zdGFsbCB8fCBkaWUgIm1ha2UgaW5zdGFsbCBmYWlsZWQiCglpZiB1c2Ugdm9yYmlzIDsgdGhl bgoJCWluc2ludG8gIiR7R0FNRVNfREFUQURJUn0vY3NtYXNoIgoJCWRvaW5zICIke01ZX09HR30i CglmaQoJZG9kb2MgQVVUSE9SUyBDUkVESVRTIFJFQURNRSoKCXByZXBnYW1lc2RpcnMKfQo=