summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Harmon <russ@eatnumber1.com>2010-04-19 01:16:57 -0400
committerRussell Harmon <russ@eatnumber1.com>2010-04-19 01:21:26 -0400
commite843b6ee859d2c89d401da8ce0807b5565651e23 (patch)
treebba4e3b908777cc3ca91d92eefd8b36953346432
parentCleanup and add manifests for inclusion in layman. (diff)
downloadeatnumber1-e843b6ee859d2c89d401da8ce0807b5565651e23.tar.gz
eatnumber1-e843b6ee859d2c89d401da8ce0807b5565651e23.tar.bz2
eatnumber1-e843b6ee859d2c89d401da8ce0807b5565651e23.zip
Remove as-needed from SConscript
-rw-r--r--games-roguelike/dwarf-fortress/Manifest4
-rw-r--r--games-roguelike/dwarf-fortress/dwarf-fortress-0.28.181.40d.ebuild3
-rw-r--r--games-roguelike/dwarf-fortress/files/dwarf-fortress-0.28.181.40d_gentoo.patch2
3 files changed, 5 insertions, 4 deletions
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index aa9b3a7..4c38c05 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -1,2 +1,2 @@
-EBUILD dwarf-fortress-0.28.181.40d.ebuild 3037 RMD160 9c5b992e931608f2061c61af13075e2bf7d97e1a SHA1 985526ae0bf8c02b285c133bb23d2701a13815b9 SHA256 2912c13b71b96687f1248e7da5a6b171a32f9cd7883c995d7abbaee201e50cde
-AUX dwarf-fortress-0.28.181.40d_gentoo.patch 2694 RMD160 9c78c97f8d1cf74f09e88ecd7831ce103ff96387 SHA1 ce199a887ddbb4ce5373f47365c66bc576676e78 SHA256 97542f7cfccf97d6787aa354e8486be5331fdc3e2c06425bff37f7ff5b14f198
+EBUILD dwarf-fortress-0.28.181.40d.ebuild 3085 RMD160 bb52f5bb17d3d967890f60a13b4d8cd171df3102 SHA1 ddfd16db908f0da749b1db2df036fe8e00e788fa SHA256 c392c9055605cd094cafc0d58fb8ed5c84bc7f64507bc877d4aef0c86c56aaf1
+AUX dwarf-fortress-0.28.181.40d_gentoo.patch 2676 RMD160 463a583d710fea900d5cb7df22641fd4fef6c07c SHA1 5e6c1cc69389fb77c936802fa3e0d6888738206f SHA256 2a7f60fe0f9c54fc41fccd0f4b4907927ccfeaf1826e178304170413181bd93d
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.28.181.40d.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.28.181.40d.ebuild
index 6e5c294..fd1c532 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.28.181.40d.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.28.181.40d.ebuild
@@ -5,7 +5,7 @@
EAPI=2
EGIT_REPO_URI="git://github.com/Baughn/Dwarf-Fortress--libgraphics-.git"
EGIT_COMMIT="00f7d2c276c06c9c592f142d2309fc7fe6c02003"
-inherit games eutils git multilib
+inherit games eutils git multilib flag-o-matic
DESCRIPTION="Dwarf Fortress is a single-player fantasy game. You can control a dwarven outpost or an adventurer in a randomly generated, persistent world."
HOMEPAGE="http://www.bay12games.com/dwarves"
@@ -78,6 +78,7 @@ pkg_setup() {
fi
multilib_toolchain_setup x86
fi
+ append-ldflags -Wl,--no-as-needed
}
src_prepare() {
diff --git a/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.28.181.40d_gentoo.patch b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.28.181.40d_gentoo.patch
index 56dd0c5..b072d67 100644
--- a/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.28.181.40d_gentoo.patch
+++ b/games-roguelike/dwarf-fortress/files/dwarf-fortress-0.28.181.40d_gentoo.patch
@@ -43,7 +43,7 @@ index b0e6bd1..edfc04b 100644
-# GLEW
-env["CPPPATH"].append('#g_src/glext')
-env["CCFLAGS"].append('-DGLEW_STATIC') # Should only be needed on windows, but can't hurt.
-+env['LINKFLAGS']=["-Wl,--as-needed",'-Wl,-rpath=\$$ORIGIN/libs','-lSDL','-lSDL_image','-lsndfile','-lz']
++env['LINKFLAGS']=['-Wl,-rpath=\$$ORIGIN/libs','-lSDL','-lSDL_image','-lsndfile','-lz']
# Generic unix, including Linux
-env['ASFLAGS']="--32"