From: Nadav Har'El <n...@scylladb.com>
Committer: Nadav Har'El <n...@scylladb.com>
Branch: master
apps/rogue: fix compilation
The rogue application compiles ncurses 5.9, but incorrectly used
header files from the system. If those are too new, rogue cannot
compile. So fix the Makefile to use the header files we downloaded
from ncurses 5.9.
Also use the opportunity to go back to downloading rogue from
rogueforge.net, which is back online, instead of a mirror.
Signed-off-by: Nadav Har'El <n...@scylladb.com>
---
diff --git a/rogue/GET b/rogue/GET
--- a/rogue/GET
+++ b/rogue/GET
@@ -23,13 +23,13 @@ make
cd ..
# Get and compile Rogue
-#wget http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz
-#tar zxvf rogue5.4.4-src.tar.gz
-#cd rogue5.4.4
-wget -c https://github.com/phs/rogue/archive/master.tar.gz
-tar zxvf master.tar.gz
-cd rogue-master
-CFLAGS="-fPIC -O2" ./configure --prefix=/usr
+wget http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz
+tar zxvf rogue5.4.4-src.tar.gz
+cd rogue5.4.4
+#wget -c https://github.com/phs/rogue/archive/master.tar.gz
+#tar zxvf master.tar.gz
+#cd rogue-master
+CFLAGS="-fPIC -O2 -I../ncurses-5.9/include" ./configure --prefix=/usr
cat >> Makefile << END
LDFLAGS=-pie
LIBS=../ncurses-5.9/lib/libncurses.a
diff --git a/rogue/usr.manifest b/rogue/usr.manifest
--- a/rogue/usr.manifest
+++ b/rogue/usr.manifest
@@ -1,2 +1,2 @@
-/usr/games/rogue: ${MODULE_DIR}/upstream/rogue-master/rogue
+/usr/games/rogue: ${MODULE_DIR}/upstream/rogue5.4.4/rogue
/usr/share/terminfo/u/unknown:
${MODULE_DIR}/upstream/fixed-terminfo/u/unknown
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.