[arch-commits] Commit in dwarffortress/trunk (PKGBUILD)

Sven-Hendrik Haase svenstaro at nymeria.archlinux.org
Tue May 20 14:05:48 UTC 2014


    Date: Tuesday, May 20, 2014 @ 16:05:47
  Author: svenstaro
Revision: 111564

Fix FS#40456

Modified:
  dwarffortress/trunk/PKGBUILD

----------+
 PKGBUILD |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-20 13:30:12 UTC (rev 111563)
+++ PKGBUILD	2014-05-20 14:05:47 UTC (rev 111564)
@@ -13,7 +13,7 @@
 install="$pkgname.install"
 license=('custom:dwarffortress')
 depends=(gtk2 glu sdl_image libsndfile openal sdl_ttf glew gcc-libs)
-makedepends=(git)
+makedepends=(git cmake)
 if [[ $CARCH == 'x86_64' ]]; then
   makedepends+=(gcc-multilib)
   depends=(gcc-libs-multilib lib32-gtk2 lib32-glu lib32-sdl_image lib32-libsndfile lib32-openal
@@ -43,6 +43,9 @@
 build() {
   cd $srcdir/dwarf_fortress_unfuck
 
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  cmake .
   make
 }
 
@@ -58,7 +61,7 @@
   install -Dm755 $srcdir/dwarffortress $pkgdir/usr/bin/dwarffortress
 
   chmod 755 $pkgdir/opt/df_linux/libs/Dwarf_Fortress
-  install -Dm755 $srcdir/dwarf_fortress_unfuck/libs/libgraphics.so $pkgdir/opt/df_linux/libs/libgraphics.so
+  install -Dm755 $srcdir/dwarf_fortress_unfuck/libgraphics.so $pkgdir/opt/df_linux/libs/libgraphics.so
   ln -s /usr/lib32/libpng.so $pkgdir/opt/df_linux/libs/libpng.so.3
   rm $pkgdir/opt/df_linux/libs/{libgcc_s.so.1,libstdc++.so.6}
 




More information about the arch-commits mailing list