mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-19 03:53:22 -04:00
dev-java/gluegen: new package, add 2.3.2
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri
15
dev-java/gluegen/files/gluegen-2.2.4-dont-copy-jars.patch
Normal file
15
dev-java/gluegen/files/gluegen-2.2.4-dont-copy-jars.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
--- a/make/build.xml
|
||||
+++ b/make/build.xml
|
||||
@@ -806,12 +806,6 @@
|
||||
</fileset>
|
||||
</jar>
|
||||
|
||||
- <!-- Copy antlr.jar into build directory for convenience so
|
||||
- gluegen.jar can be run via "java -jar". antlr.jar is
|
||||
- referenced via a Class-Path entry in the Manifest of
|
||||
- gluegen.jar. -->
|
||||
- <copy file="${antlr.jar}" todir="${build}" />
|
||||
-
|
||||
<!-- copy a jnlp with empty codebase into build folder for local testing
|
||||
overwrite property in gluegen.proerpties if desired -->
|
||||
<property name="gluegen.jnlp.codebase" value=""/>
|
||||
20
dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch
Normal file
20
dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch
Normal file
@@ -0,0 +1,20 @@
|
||||
--- a/make/gluegen-cpptasks-base.xml
|
||||
+++ b/make/gluegen-cpptasks-base.xml
|
||||
@@ -1511,17 +1511,6 @@
|
||||
- Helper strip.libraries for stripping off debug information
|
||||
-->
|
||||
<target name="gluegen.cpptasks.striplibs" depends="gluegen.cpptasks.initialize" if="c.strip.libraries">
|
||||
- <echo message="Strip symbols from libs in ${libdir}" />
|
||||
- <apply dir="${libdir}" executable="${c.strip.tool}" parallel="false"
|
||||
- failonerror="true">
|
||||
- <arg line="${c.strip.args}"/>
|
||||
- <fileset dir="${libdir}">
|
||||
- <include name="**/*.so"/> <!-- unix -->
|
||||
- <include name="**/*.dll"/> <!-- windows -->
|
||||
- <include name="**/*.dylib"/> <!-- macosx -->
|
||||
- <include name="**/*.jnilib"/> <!-- macosx -->
|
||||
- </fileset>
|
||||
- </apply>
|
||||
</target>
|
||||
|
||||
<!-- ================================================================== -->
|
||||
14
dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch
Normal file
14
dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch
Normal file
@@ -0,0 +1,14 @@
|
||||
--- a/make/build-test.xml
|
||||
+++ b/make/build-test.xml
|
||||
@@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
|
||||
|
||||
<!-- updates / create the test results zip file -->
|
||||
<target name="test-zip-archive" depends="init">
|
||||
+ <!--
|
||||
<archive.7z destfile="${build}/${test.archive.name}.7z"
|
||||
basedir="${project.root}"
|
||||
includes="${rootrel.build}/test/results ${rootrel.build}/test/results-x64 ${rootrel.build}/test/results-x32" />
|
||||
+ -->
|
||||
</target>
|
||||
|
||||
|
||||
106
dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch
Normal file
106
dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch
Normal file
@@ -0,0 +1,106 @@
|
||||
--- a/make/gluegen-cpptasks-base.xml
|
||||
+++ b/make/gluegen-cpptasks-base.xml
|
||||
@@ -1216,21 +1216,12 @@
|
||||
|
||||
<!-- Unix linker configuration -->
|
||||
|
||||
- <linker id="linker.cfg.linux" name="${gcc.compat.compiler}">
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
- </linker>
|
||||
-
|
||||
<linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}">
|
||||
<linkerarg value="-m32"/>
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}">
|
||||
<linkerarg value="-m64"/>
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<!-- Using default compiler settings - utilize:
|
||||
@@ -1241,16 +1232,12 @@
|
||||
<linkerarg value="-fpic" />
|
||||
<linkerarg value="-nostdlib" />
|
||||
<linkerarg value="-Bdynamic" />
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
|
||||
<linkerarg value="-fpic" />
|
||||
<linkerarg value="-nostdlib" />
|
||||
<linkerarg value="-Bdynamic" />
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
|
||||
@@ -1296,20 +1283,14 @@
|
||||
|
||||
<linker id="linker.cfg.solaris" name="${gcc.compat.compiler}">
|
||||
<linkerarg value="-m32"/>
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.solaris.sparcv9" name="${gcc.compat.compiler}">
|
||||
<linkerarg value="-xarch=v9a" />
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.solaris.amd64" name="${gcc.compat.compiler}">
|
||||
<linkerarg value="-m64"/>
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
<!-- linkerarg value="-xarch=amd64" / -->
|
||||
</linker>
|
||||
|
||||
@@ -1324,8 +1305,6 @@
|
||||
<linkerarg value="-arch" if="use.macosx64"/>
|
||||
<linkerarg value="x86_64" if="use.macosx64"/>
|
||||
<linkerarg value="-mmacosx-version-min=10.5"/>
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
<!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard -->
|
||||
</linker>
|
||||
|
||||
@@ -1334,16 +1313,12 @@
|
||||
<!--linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.Gcc64Linker"-->
|
||||
<linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
|
||||
<linkerarg value="-m64"/>
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<!--linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker"-->
|
||||
<linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
|
||||
<linkerarg value="-m32"/>
|
||||
<linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.win32.mingw" name="${gcc.compat.compiler}" incremental="false">
|
||||
@@ -1351,8 +1326,6 @@
|
||||
<linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly -->
|
||||
<linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly -->
|
||||
<linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.win64.mingw" name="${gcc.compat.compiler}" incremental="false">
|
||||
@@ -1360,8 +1333,6 @@
|
||||
<linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly -->
|
||||
<linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly -->
|
||||
<linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
|
||||
- <linkerarg value="-static-libgcc" if="isGCC"/>
|
||||
- <linkerarg value="-static-libstdc++" if="isGCC"/>
|
||||
</linker>
|
||||
|
||||
<linker id="linker.cfg.win32.msvc" name="msvc" incremental="false">
|
||||
23
dev-java/gluegen/files/gluegen-2.3.2-respect-flags.patch
Normal file
23
dev-java/gluegen/files/gluegen-2.3.2-respect-flags.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,18 +1,16 @@
|
||||
BITS=32
|
||||
|
||||
ifeq ($(BITS),32)
|
||||
- CC=gcc32
|
||||
NS=win-x86
|
||||
SCFLAGS=
|
||||
else
|
||||
BITS=64
|
||||
- CC=gcc64
|
||||
NS=win-x64
|
||||
SCFLAGS=-D_MSC_VER=1400
|
||||
endif
|
||||
|
||||
-CFLAGS=-m$(BITS) -shared -c -fno-rtti -fPIC $(SCFLAGS) -I/usr/lib/jvm/java-6-sun/include -I../common/platform-libs/jre-include/win32
|
||||
-LFLAGS=-m$(BITS) -shared -fno-rtti -fPIC
|
||||
+CFLAGS += -m$(BITS) -shared -c -fPIC $(SCFLAGS) -I/usr/lib/jvm/java-6-sun/include -I../common/platform-libs/jre-include/win32
|
||||
+LFLAGS = $(LDFLAGS) -m$(BITS) -shared -fPIC
|
||||
|
||||
SRC1=src/native/common/CPU.c
|
||||
SRC2=src/native/windows/WindowsDynamicLinkerImpl_JNI.c
|
||||
Reference in New Issue
Block a user