diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-09-09 11:50:13 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-09-09 11:50:13 +0000 |
| commit | fd90651ab1f845043c7c8b21d7e4823431c0db9e (patch) | |
| tree | 8546d8095de95d1df9fa49b3ebf3e0e6a01bf0d3 /games-strategy/ufo-ai | |
| parent | Stable for x86, wrt bug #522184 (diff) | |
| download | historical-fd90651ab1f845043c7c8b21d7e4823431c0db9e.tar.gz historical-fd90651ab1f845043c7c8b21d7e4823431c0db9e.tar.bz2 historical-fd90651ab1f845043c7c8b21d7e4823431c0db9e.zip | |
Complete -mathlib.patch by adding -lm to one more location in the linking wrt #516938 by "M. B."
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'games-strategy/ufo-ai')
| -rw-r--r-- | games-strategy/ufo-ai/ChangeLog | 7 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/Manifest | 20 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch | 11 |
3 files changed, 27 insertions, 11 deletions
diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog index 23e94ce8a6ca..5be5f415a3ae 100644 --- a/games-strategy/ufo-ai/ChangeLog +++ b/games-strategy/ufo-ai/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-strategy/ufo-ai # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.42 2014/05/10 05:40:33 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.43 2014/09/09 11:50:08 ssuominen Exp $ + + 09 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> + files/ufo-ai-2.4-mathlib.patch: + Complete -mathlib.patch by adding -lm to one more location in the linking wrt + #516938 by "M. B." 10 May 2014; Samuli Suominen <ssuominen@gentoo.org> +files/ufo-ai-2.4-mathlib.patch, ufo-ai-2.4.ebuild: diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest index a05f42c477e9..bc69b641cf60 100644 --- a/games-strategy/ufo-ai/Manifest +++ b/games-strategy/ufo-ai/Manifest @@ -2,21 +2,21 @@ Hash: SHA256 AUX ufo-ai-2.4-locale.patch 744 SHA256 edf333eea46aaea2a43529d4d323d2b317a9376c39e5952a2b92d7bf25fe110b SHA512 94ae4710bfed572abe7dd4b6238ddb4e240c55250e608d63fc1c8ccf67567927721a0f09234ae7a018fe38e4f5a0bc47745b483e5073d5a4da3816d99853746d WHIRLPOOL 13b655d127c34353c1cd73e5b4e62dc9267892f0288b39aef4c28b1c0d8bbe163b60a1d232c4a1912fe8e52404799d47cb1f1a9dd82d95754140db31583129da -AUX ufo-ai-2.4-mathlib.patch 1054 SHA256 5f09f55695b010ca3f50158342a8126a29fe3dff15c5672e07fb8891062b8635 SHA512 1c2f132a6845941530cab87e2f31981c98846d8b08da282fb20392984a848a200e8595facda1e6ec0e238bac9a181a329d78c5f50dc79786cb06f74c6097fc80 WHIRLPOOL 08e53f2ce959e65e068e4f67df13c7c2932709fa8342db14909d83acaab5c1292ac868706fc3f329980cdafb7ab7cbba4da3ded29aa9c9bfda4650739c29c9b9 +AUX ufo-ai-2.4-mathlib.patch 1852 SHA256 4de46ec51a00b3e68a270dc18a67605663b0de372164f9e08fc182e87f8f45e3 SHA512 3b086458e94ea9a7f1efd4ecb7d96a5b44e326f0d59916476595bf328c1e66250241124a74921302a9e139eeb61fd7b2a860fd972bbbc5664157bf60a2196b02 WHIRLPOOL 1821dff2538794997a22109258a949d8a7ca1589ee52c1efdefa8581f1582a64d938a37154f454496bfc9a1f86c684031b78ff61678f5d8c0885e647fc401dd9 DIST 1maps.pk3 242016 SHA256 8cdb8c231c0ba98900d97012b62c5cef72ab5710fe3f087e534496a66f7b0e4e SHA512 9615b365e590dceb82362e7cd683980e15401a3b5a2b359a33c7ed2a4c51e5328efb352618cc48f46971a2ced1717276b5270ca6bf6d2bc7fc2b2238030eb3ae WHIRLPOOL 8e798ffeaa83609114fd239ea8f379ee54fa6038735a09bd3abe3076073e92b44e7fa867c893d597577da462b4e583fb0a2bba7cd2014a9f4b4bb8ef04b377e6 DIST ufoai-2.4-data.tar 937062400 SHA256 6bb322fc0362781d07439799de32c677884cef7c96fcf17dd87c62cc108030b7 SHA512 471eab2f62cad144fe9966317d48c408fba19de0c33cf7414918b502c723b722af38a025f808848698d9a06ffc10fb0faac145dd01dcd3d321547c87da1c6246 WHIRLPOOL 139251bdbd76f86cb38175eb9c14149ea0cab6bbcb04e2dba7351cdb5b0e21bdfd231e350c0af4f52379d0c5bee91f0512422a7eb9f6339eb6a07170d64fec0c DIST ufoai-2.4-source.tar.bz2 16875353 SHA256 254a61b770f141374d57e5c2589048be9298d0a920e914c6e72c2b98255bb94f SHA512 3f9d0df7392f50c201464c81e42435f860df97d5d7a2ef53bb9a05d2b2fc645a1130baaf16fc34818b88bb07b8cf83283f7479d685cbd3caf80ea7522e13c56f WHIRLPOOL 0e68149ab2b3eeffb7134e65cc29de9cecf60dc89c965958a0d669c2d22462d05b89b0a81a3225ebbd7e47015fc63697cbad365136706f4853f9c1e690b0667d EBUILD ufo-ai-2.4.ebuild 2883 SHA256 3cf34d552e9a4e007c897da4517f4ef56c7ad5c73d69beaf5e6c4ebba0bf2275 SHA512 c3193c0cf2fd17e3c7885be278c709955ba4bc5682404c7022cd8df12129198a3285c0cb2252e8747564bdcb1f0ce58a2fe9c3c5b37d82648ef2f049b60f82b7 WHIRLPOOL 1a4cd5b16ab1215cbfb39a5c81dd55096bb28af166dc71ae4a75eb61873fcd38663405bfd4f391f7cd9dbbc853adb61e53db1d19460248fa732975a761ae22cd -MISC ChangeLog 6123 SHA256 9d23af73ac309c3c4cc2358732af9b1d9f2ec2dcb7cc41d2e54180488788006e SHA512 bdd9c92af51ce1816bb05750d2bc0e588424ffbd7ec740fea7e0ffcb86ded009d091b32d79d9096b767ef8b074f5cfcf7f157f8a69a496cb414e4a3c7c7f484a WHIRLPOOL 7a53d261e4d3a756f1abb1638e0384c23f75985fae55e8e814ff2ef9a0725484fdbde47f6d71b86e0f88228998c41daab9abb4038d293a246c2a64e99f567b02 +MISC ChangeLog 6313 SHA256 8e993c130a3f3317fa04321dcba1ac06b4f9b8719d9dcbdc32a26d93337a45d8 SHA512 1e0c238cd503a7b0f1d88119756c421a5246f2971be147e5fffcb4724cbd327df8d259ed8a6c07345a88024ea654af569809d762d1ec7c2baee47d90199c83b6 WHIRLPOOL 6040c0a73f2d0cd2ca7ab531230b21beece5f8870a79a4ffa4e7b860d6a08965b8a124774e2858e3b93f846bcca9052fe6016eab040710927f3cc04fb9f088ca MISC metadata.xml 219 SHA256 266385ce0470b911b2b3ca5fe6b237ad5dfc2d480533be5453537328a08cb2eb SHA512 367f0880f9a5e9db1df03545ad02d88b38b0c72ede5315f0dce19d9c4aa5fe93cc50b1870ee441f662a4b7d899c52d44910c8eefa24b81b6fa49d1dcc3c66d1c WHIRLPOOL 730328333f19c2e720cf4c1cd9f5ed7ffca92602cf91fff0105f9eb3a5ed1bfcf0b0cea6b3a09b24a84e1c0ccb814b77009b7f4d23026ce58babbc1195ff552e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQEcBAEBCAAGBQJTbbuRAAoJEEdUh39IaPFNpykH/ieh6RGLH4fohHAnIQQ39t8d -4en5/3P12kii9jZBcQWGRO8b1e8ry93ROfL5LvfePTRqMBi+a8qus3AbQ2UzV6jy -8WWW+BhyTUua1DBErKbXy/I0iE/2mExALRn+hd/y7hmFVUCEDhyFTId/ZhUuSEQf -hW54pryOtc2V3zmT0hk7uDK/vTcRHZ4y5N+Er1ZPWd/vumz0zIXhdxh+NrwGprT7 -1t4awYqm/Mtiu26t90MN6l7QHgYG7OVuwn5rNfcaR17BZY5OzwLSRGhEjKiDCSyX -4FGROHjn4k57k0Lj1OtFdqxyLw43TZTB3x4hZOZzNYPmoCpLtnWnrpPSGQK/llM= -=JlTQ +iQEcBAEBCAAGBQJUDuikAAoJEEdUh39IaPFN13gH/iO1F2ZCAjC2MmMbfgKfp0Oe +OifOiAyRN/u9V0zh0HBMk3utA+rmauhvb065NZCSKjCBAS3462dJgLv2Jt6dHTVW +Xek4hz12SzkF+PkYSMlmyHOedQNREgDm4U0RNrWi4eZ2RTDH6HJf7mBjYae7fAv6 +DB04HfTSUTntzrhWWzC3wXJLXqWKEmejwNAcC+9YCkuwgurIP7vbR9jF8+SFVj4r +E8ZWLBvxOWZEuRKuKgmJUSG4NTv92WBJDSmH1bo+jHP2ofgw9jHR/axZJjkB4jMv +XhBssObydc4JFbU48L9s47e2yFinOUf31ydBplbgAk+e7N5mxXP9Qtw5pqVKajA= +=scoi -----END PGP SIGNATURE----- diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch index d66505c611af..72fd81038fb6 100644 --- a/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch +++ b/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch @@ -16,3 +16,14 @@ collect2: error: ld returned 1 exit status $(TARGET)_SRCS = \ client/cl_console.c \ +--- build/modules/testall.mk ++++ build/modules/testall.mk +@@ -9,7 +9,7 @@ + $(TARGET)_LINKER := $(CC) + $(TARGET)_FILE := $(TARGET)$(EXE_EXT) + $(TARGET)_CFLAGS += -DCOMPILE_UFO -DHARD_LINKED_GAME -DCOMPILE_UNITTESTS $(BFD_CFLAGS) $(SDL_CFLAGS) $(CURL_CFLAGS) $(OGG_CFLAGS) $(MXML_CFLAGS) +-$(TARGET)_LDFLAGS += -lcunit -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz ++$(TARGET)_LDFLAGS += -lcunit -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz -lm + + $(TARGET)_SRCS = \ + tests/test_all.c \ |