Bugzilla – Attachment 807 Details for
Bug 1316
Java 8 expects *.dylib instead of *.jnilib on OS X
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
JOGL patch
jogl1316.patch (text/plain), 7.63 KB, created by
Julien Gouesse
on 2019-03-29 20:38:05 CET
(
hide
)
Description:
JOGL patch
Filename:
MIME Type:
Creator:
Julien Gouesse
Created:
2019-03-29 20:38:05 CET
Size:
7.63 KB
patch
obsolete
>diff --git a/make/build-jogl.xml b/make/build-jogl.xml >index 0f1b435c2..0ad2569d4 100644 >--- a/make/build-jogl.xml >+++ b/make/build-jogl.xml >@@ -1435,10 +1435,6 @@ > <move file="${src}" tofile="${dest}" /> > </target> > >- <target name="rename.dylib" if="isOSX"> >- <move file="${src}" tofile="${dest}" /> >- </target> >- > <!-- Only compile the ffmpeg version depending source files > against their respective header files! > We do not use the resulting static libraries directly, >@@ -1473,7 +1469,7 @@ > <targetfiles> > <fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.so"/> > <fileset dir="${obj.joglsub}" includes="@{output.lib.name}.dll"/> >- <fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.jnilib"/> >+ <fileset dir="${obj.joglsub}" includes="lib@{output.lib.name}.dylib"/> > </targetfiles> > <sequential> > <cc outtype="shared" >@@ -1595,7 +1591,7 @@ > <targetfiles> > <fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.so"/> > <fileset dir="${obj.jogl}" includes="@{output.lib.name}.dll"/> >- <fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.jnilib"/> >+ <fileset dir="${obj.jogl}" includes="lib@{output.lib.name}.dylib"/> > </targetfiles> > <sequential> > <cc outtype="shared" >@@ -1644,13 +1640,6 @@ > > <!-- FIXME: this is a hack; the cpptask should have an option to change the > suffix or at least understand the override from dylib to jnilib --> >- <antcall target="rename.dylib" inheritRefs="true"> >- <param name="src" value="${obj.jogl}/lib@{output.lib.name}.dylib" /> >- <param name="dest" value="${obj.jogl}/lib@{output.lib.name}.jnilib" /> >- </antcall> >- >- <!-- FIXME: this is a hack; the cpptask should have an option to change the >- suffix or at least understand the override from dylib to jnilib --> > <antcall target="rename.mingw.dll" inheritRefs="true"> > <param name="src" value="${obj.jogl}/lib@{output.lib.name}.so" /> > <param name="dest" value="${obj.jogl}/@{output.lib.name}.dll" /> >diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml >index b4d7858a7..697040918 100644 >--- a/make/build-nativewindow.xml >+++ b/make/build-nativewindow.xml >@@ -616,10 +616,6 @@ > <move file="${src}" tofile="${dest}" /> > </target> > >- <target name="rename.dylib" if="isOSX"> >- <move file="${src}" tofile="${dest}" /> >- </target> >- > <macrodef name="c.build"> > <attribute name="c.compiler.src.files" /> > <attribute name="compiler.cfg.id" /> >@@ -688,7 +684,7 @@ > <targetfiles> > <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.so"/> > <fileset dir="${obj.nativewindow}" includes="@{output.lib.name}.dll"/> >- <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.jnilib"/> >+ <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.dylib"/> > </targetfiles> > <sequential> > <cc outtype="shared" >@@ -729,13 +725,6 @@ > > <!-- FIXME: this is a hack; the cpptask should have an option to change the > suffix or at least understand the override from dylib to jnilib --> >- <antcall target="rename.dylib" inheritRefs="true"> >- <param name="src" value="${obj.nativewindow}/lib@{output.lib.name}.dylib" /> >- <param name="dest" value="${obj.nativewindow}/lib@{output.lib.name}.jnilib" /> >- </antcall> >- >- <!-- FIXME: this is a hack; the cpptask should have an option to change the >- suffix or at least understand the override from dylib to jnilib --> > <antcall target="rename.mingw.dll" inheritRefs="true"> > <param name="src" value="${obj.nativewindow}/lib@{output.lib.name}.so" /> > <param name="dest" value="${obj.nativewindow}/@{output.lib.name}.dll" /> >diff --git a/make/build-newt.xml b/make/build-newt.xml >index 733d5aebd..dd6037d98 100644 >--- a/make/build-newt.xml >+++ b/make/build-newt.xml >@@ -620,10 +620,6 @@ > <move file="${src}" tofile="${dest}" /> > </target> > >- <target name="rename.dylib" if="isOSX"> >- <move file="${src}" tofile="${dest}" /> >- </target> >- > <macrodef name="c.build"> > <attribute name="c.compiler.src.files" /> > <attribute name="compiler.cfg.id" /> >@@ -672,7 +668,7 @@ > <targetfiles> > <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.so"/> > <fileset dir="${obj.newt}" includes="@{output.lib.name}.dll"/> >- <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.jnilib"/> >+ <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.dylib"/> > </targetfiles> > <sequential> > <cc outtype="shared" >@@ -718,13 +714,6 @@ > > <!-- FIXME: this is a hack; the cpptask should have an option to change the > suffix or at least understand the override from dylib to jnilib --> >- <antcall target="rename.dylib" inheritRefs="true"> >- <param name="src" value="${obj.newt}/lib@{output.lib.name}.dylib" /> >- <param name="dest" value="${obj.newt}/lib@{output.lib.name}.jnilib" /> >- </antcall> >- >- <!-- FIXME: this is a hack; the cpptask should have an option to change the >- suffix or at least understand the override from dylib to jnilib --> > <antcall target="rename.mingw.dll" inheritRefs="true"> > <param name="src" value="${obj.newt}/lib@{output.lib.name}.so" /> > <param name="dest" value="${obj.newt}/@{output.lib.name}.dll" /> >diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml >index b89b66fb7..a2564c944 100644 >--- a/make/build-oculusvr.xml >+++ b/make/build-oculusvr.xml >@@ -411,10 +411,6 @@ > <move file="${src}" tofile="${dest}" /> > </target> > >- <target name="rename.dylib" if="isOSX"> >- <move file="${src}" tofile="${dest}" /> >- </target> >- > <macrodef name="c.build"> > <attribute name="compiler.cfg.id" /> > <attribute name="linker.cfg.id" /> >@@ -530,7 +526,7 @@ > <targetfiles> > <fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.so"/> > <fileset dir="${obj.oculusvr}" includes="@{output.lib.name}.dll"/> >- <fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.jnilib"/> >+ <fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.dylib"/> > </targetfiles> > <sequential> > <!-- C Compilation --> >@@ -661,13 +657,6 @@ > > <!-- FIXME: this is a hack; the cpptask should have an option to change the > suffix or at least understand the override from dylib to jnilib --> >- <antcall target="rename.dylib" inheritRefs="true"> >- <param name="src" value="${obj.oculusvr}/lib@{output.lib.name}.dylib" /> >- <param name="dest" value="${obj.oculusvr}/lib@{output.lib.name}.jnilib" /> >- </antcall> >- >- <!-- FIXME: this is a hack; the cpptask should have an option to change the >- suffix or at least understand the override from dylib to jnilib --> > <antcall target="rename.mingw.dll" inheritRefs="true"> > <param name="src" value="${obj.oculusvr}/lib@{output.lib.name}.so" /> > <param name="dest" value="${obj.oculusvr}/@{output.lib.name}.dll" />
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1316
:
804
|
805
|
806
| 807