celestia-glut: fix PIE + redefine warning
This commit is contained in:
parent
947960517e
commit
6892758e20
2 changed files with 17 additions and 2 deletions
14
srcpkgs/celestia-glut/patches/fix-stdint_redefine.patch
Normal file
14
srcpkgs/celestia-glut/patches/fix-stdint_redefine.patch
Normal 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
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'celestia-glut'
|
# Template file for 'celestia-glut'
|
||||||
pkgname=celestia-glut
|
pkgname=celestia-glut
|
||||||
version=1.6.1
|
version=1.6.1
|
||||||
revision=3
|
revision=4
|
||||||
short_desc="free space simulation using GLUT"
|
short_desc="free space simulation using GLUT"
|
||||||
maintainer="Martin Riese <grauehaare@gmx.de>"
|
maintainer="Martin Riese <grauehaare@gmx.de>"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
|
@ -18,5 +18,6 @@ provides="celestia-${version}_${revision}"
|
||||||
replaces="celestia>=0"
|
replaces="celestia>=0"
|
||||||
|
|
||||||
do_build() {
|
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"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue