celestia-glut: fix PIE + redefine warning

This commit is contained in:
Juergen Buchmueller 2016-09-02 17:46:44 +02:00
parent 947960517e
commit 6892758e20
2 changed files with 17 additions and 2 deletions

View file

@ -0,0 +1,14 @@
Do not try to redefine INT64_MAX, if it is already defined.
--- src/celutil/basictypes.h 2011-06-05 18:11:15.000000000 +0200
+++ src/celutil/basictypes.h 2016-09-02 17:41:33.335187908 +0200
@@ -31,7 +31,9 @@
#include <limits>
typedef int64_t int64;
typedef uint64_t uint64;
+#ifndef INT64_MAX
#define INT64_MAX 9223372036854775807LL
+#endif
#ifndef UINT64_MAX
#define UINT64_MAX 0xffffffffffffffffULL
#endif

View file

@ -1,7 +1,7 @@
# Template file for 'celestia-glut'
pkgname=celestia-glut
version=1.6.1
revision=3
revision=4
short_desc="free space simulation using GLUT"
maintainer="Martin Riese <grauehaare@gmx.de>"
license="GPL-2"
@ -18,5 +18,6 @@ provides="celestia-${version}_${revision}"
replaces="celestia>=0"
do_build() {
make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="-lpng -ljpeg -llua5.1 -lglut -lGLU -lGL -logg -ltheora -lz -ldl -pthread"
local _libs="-lpng -ljpeg -llua5.1 -lglut -lGLU -lGL -logg -ltheora -lz -ldl"
make ${makejobs} CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="${LDFLAGS} ${_libs} -pthread"
}