rpms/sdljava
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- And the dejavu-fonts fontfile names changed back again (what fun)

Browse source 
- The gcj bug causing us to not compile has been fixed, use gcj again and
    drop ExclusiveArch
- There is no reason for us to run ldconfig!
- Sigh we must now define __arch__ ourself as the newer swig doesn't
This commit is contained in:
Hans de Goede 2007-12-09 23:53:54 +00:00
commit a02bccbd6b
2 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sdljava-0.9.1-regen.patch
View file

@ -6,7 +6,7 @@ diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/li
CFLAGS=-O3
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I/usr/local/include -I/usr/local/include/SDL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I@GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I@GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit @ARCH_DEFINES@
SDLJAVA_I=SDLAudio.i\
SDLCdrom.i\
@ -83,7 +83,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/b
CFLAGS=-O3
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ @ARCH_DEFINES@
GLJAVA_I=glew.i
@ -112,7 +112,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/
CFLAGS=-O3
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/include/FTGL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL @ARCH_DEFINES@
FTGLJAVA_OBJ=FTGL_wrap.o
FTGLJAVA_LIB=-lGLU -lGL -lfreetype -lz -lftgl

51
sdljava.spec
View file

@ -67,6 +67,29 @@ sed -i "s#@GCC_INCLUDE_PATH@#$GCC_PATH/include#g" \
etc/build/gljava/linux/Makefile \
etc/build/gljava/linux/ftgl/Makefile
# add arch defines for swig <-> SDL_config.h wrapper happiness
# special case ppc as the define is powerpc not ppc and both ppc and ppc64
# must be set for ppc64
%ifarch ppc
ARCHDEFS="-D__powerpc__"
%endif
%ifarch ppc64
ARCHDEFS="-D__powerpc__ -D__powerpc64__"
%endif
# special case ix86 as all of ix86 should define __i386__
%ifarch %{ix86}
ARCHDEFS="-D__i386__"
%endif
# All other archs
if [ -z "$ARCHDEFS" ]; then
ARCHDEFS="-D__%{_arch}__"
fi
# And actually patch the defines into the makefiles
sed -i "s/@ARCH_DEFINES@/$ARCHDEFS/g" \
etc/build/linux/Makefile \
etc/build/gljava/linux/Makefile \
etc/build/gljava/linux/ftgl/Makefile
# adjust testdata path in demos
find ./testsrc -name '*.java' | xargs sed -i \
-e 's|testdata|%{_datadir}/%{name}/testdata|g'
@ -89,37 +112,17 @@ rm src/org/gljava/opengl/native/glew_wrap.c
%build
# special case ppc as the define is powerpc not ppc and both ppc and ppc64
# must be set for ppc64
%ifarch ppc
CFLAGS="$RPM_OPT_FLAGS -D__powerpc__ -fno-strict-aliasing -fPIC"
%endif
%ifarch ppc64
CFLAGS="$RPM_OPT_FLAGS -D__powerpc__ -D__powerpc64__ -fno-strict-aliasing -fPIC"
%endif
# special case ix86 as all of ix86 should define __i386__
%ifarch %{ix86}
CFLAGS="$RPM_OPT_FLAGS -D__i386__ -fno-strict-aliasing -fPIC"
%endif
# All other archs
if [ -z "$CFLAGS" ]; then
CFLAGS="$RPM_OPT_FLAGS -D__%{_arch}__ -fno-strict-aliasing -fPIC"
fi
pushd src/sdljava/native
make CFLAGS="$CFLAGS"
make libsdljava_gfx.so CFLAGS="$CFLAGS"
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd
pushd src/org/gljava/opengl/native
make CFLAGS="$CFLAGS"
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd
pushd src/org/gljava/opengl/native/ftgl
make CFLAGS="$CFLAGS"
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
popd
ant jar javadoc