diff options
Diffstat (limited to 'dev-java/gluegen/files/gluegen-2.3.2-armhf.diff')
| -rw-r--r-- | dev-java/gluegen/files/gluegen-2.3.2-armhf.diff | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff b/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff deleted file mode 100644 index a474552cd..000000000 --- a/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff +++ /dev/null @@ -1,62 +0,0 @@ ---- a/make/build.xml -+++ b/make/build.xml -@@ -262,10 +262,16 @@ - <property name="linker.cfg.id" value="linker.cfg.linux" /> - </target> - -- <target name="declare.linux.armv6" if="isLinuxARMv6"> -- <echo message="Linux.armv6" /> -- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6" /> -- <property name="linker.cfg.id" value="linker.cfg.linux.armv6" /> -+ <target name="declare.linux.armv6.armel" if="isLinuxARMv6Armel"> -+ <echo message="Linux.armv6.armel" /> -+ <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.armel" /> -+ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armel" /> -+ </target> -+ -+ <target name="declare.linux.armv6.armhf" if="isLinuxARMv6Armhf"> -+ <echo message="Linux.armv6.armhf" /> -+ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> -+ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armhf" /> - </target> - - <target name="declare.linux.alpha" if="isLinuxAlpha"> -@@ -328,7 +334,7 @@ - <property name="linker.cfg.id" value="linker.cfg.linux.sparc" /> - </target> - -- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" > -+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" > - <property name="c.src.dir.os" value="unix" /> - </target> - ---- a/make/gluegen-cpptasks-base.xml -+++ b/make/gluegen-cpptasks-base.xml -@@ -1032,7 +1032,7 @@ - - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or - - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) - for official JogAmp builds! --> -- <compiler id="compiler.cfg.linux.armv6" name="${gcc.compat.compiler}"> -+ <compiler id="compiler.cfg.linux.armv6.armel" name="${gcc.compat.compiler}"> - <defineset> - <define name="__unix__"/> - <define name="__X11__" if="isX11"/> -@@ -1270,7 +1270,7 @@ - - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or - - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp) - for official JogAmp builds! --> -- <linker id="linker.cfg.linux.armv6" name="${gcc.compat.compiler}"> -+ <linker id="linker.cfg.linux.armv6.armel" name="${gcc.compat.compiler}"> - <linkerarg value="-fpic" /> - <linkerarg value="-nostdlib" /> - <linkerarg value="-Bdynamic" /> -@@ -1286,6 +1286,9 @@ - <linkerarg value="-static-libstdc++" if="isGCC"/> - </linker> - -+ <linker id="linker.cfg.linux.armv6.armhf" name="${gcc.compat.compiler}"> -+ </linker> -+ - <linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}"> - </linker> - |