mirror of
https://git.freebsd.org/ports.git
synced 2025-05-28 17:06:32 -04:00
202 lines
10 KiB
Text
202 lines
10 KiB
Text
--- jogl/make/build-jogl.xml.orig 2015-10-10 01:08:14 UTC
|
|
+++ jogl/make/build-jogl.xml
|
|
@@ -1184,9 +1184,9 @@
|
|
<!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
|
|
|
|
<compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd">
|
|
- <!-- Need to force X11R6 headers on to include path after stub_includes -->
|
|
- <includepath path="stub_includes/opengl"/>
|
|
- <includepath path="/usr/local/include" />
|
|
+ <!-- Force /usr/local/include headers on to include path after all others to fix build with clang -->
|
|
+ <compilerarg value="-idirafter" />
|
|
+ <compilerarg value="/usr/local/include" />
|
|
</compiler>
|
|
|
|
<compiler id="compiler.cfg.linux.armv6.jogl.x11" extends="compiler.cfg.linux.armv6">
|
|
@@ -1203,7 +1203,7 @@
|
|
|
|
<!-- linker configuration -->
|
|
|
|
- <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd">
|
|
+ <linker id="linker.cfg.freebsd.x86.jogl.x11" extends="linker.cfg.freebsd.x86">
|
|
<syslibset dir="/usr/local/lib" libs="X11"/>
|
|
</linker>
|
|
|
|
@@ -1211,6 +1211,14 @@
|
|
<syslibset dir="/usr/local/lib" libs="X11"/>
|
|
</linker>
|
|
|
|
+ <linker id="linker.cfg.freebsd.ppc64.jogl.x11" extends="linker.cfg.freebsd.ppc64">
|
|
+ <syslibset dir="/usr/local/lib" libs="X11"/>
|
|
+ </linker>
|
|
+
|
|
+ <linker id="linker.cfg.freebsd.ppc64le.jogl.x11" extends="linker.cfg.freebsd.ppc64le">
|
|
+ <syslibset dir="/usr/local/lib" libs="X11"/>
|
|
+ </linker>
|
|
+
|
|
<linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux">
|
|
<syslibset libs="X11"/>
|
|
</linker>
|
|
@@ -1401,7 +1409,7 @@
|
|
<target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
|
|
<echo message="FreeBSD" />
|
|
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" />
|
|
- <property name="linker.cfg.id.os" value="linker.cfg.freebsd.jogl.x11" />
|
|
+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.x86.jogl.x11" />
|
|
</target>
|
|
|
|
<target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
|
|
@@ -1410,7 +1418,19 @@
|
|
<property name="linker.cfg.id.os" value="linker.cfg.freebsd.amd64.jogl.x11" />
|
|
</target>
|
|
|
|
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
|
|
+ <target name="c.configure.freebsd.ppc64" depends="c.configure.x11" if="isFreeBSDPpc64">
|
|
+ <echo message="FreeBSD" />
|
|
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" />
|
|
+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc64.jogl.x11" />
|
|
+ </target>
|
|
+
|
|
+ <target name="c.configure.freebsd.ppc64le" depends="c.configure.x11" if="isFreeBSDPpc64le">
|
|
+ <echo message="FreeBSD" />
|
|
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" />
|
|
+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc64le.jogl.x11" />
|
|
+ </target>
|
|
+
|
|
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD" />
|
|
|
|
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
|
|
<echo message="HP-UX" />
|
|
--- jogl/make/build-nativewindow.xml.orig 2015-10-10 01:08:14 UTC
|
|
+++ jogl/make/build-nativewindow.xml
|
|
@@ -373,7 +373,7 @@
|
|
|
|
<!-- linker configuration -->
|
|
|
|
- <linker id="linker.cfg.freebsd.nativewindow.x11" extends="linker.cfg.freebsd">
|
|
+ <linker id="linker.cfg.freebsd.x86.nativewindow.x11" extends="linker.cfg.freebsd.x86">
|
|
<syslibset dir="/usr/local/lib" libs="X11"/>
|
|
<syslibset dir="/usr/local/lib" libs="Xxf86vm" />
|
|
<syslibset dir="/usr/local/lib" libs="Xrender"/>
|
|
@@ -385,6 +385,18 @@
|
|
<syslibset dir="/usr/local/lib" libs="Xrender"/>
|
|
</linker>
|
|
|
|
+ <linker id="linker.cfg.freebsd.ppc64.nativewindow.x11" extends="linker.cfg.freebsd.ppc64">
|
|
+ <syslibset dir="/usr/local/lib" libs="X11" />
|
|
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
|
|
+ <syslibset dir="/usr/local/lib" libs="Xrender"/>
|
|
+ </linker>
|
|
+
|
|
+ <linker id="linker.cfg.freebsd.ppc64le.nativewindow.x11" extends="linker.cfg.freebsd.ppc64le">
|
|
+ <syslibset dir="/usr/local/lib" libs="X11" />
|
|
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
|
|
+ <syslibset dir="/usr/local/lib" libs="Xrender"/>
|
|
+ </linker>
|
|
+
|
|
<linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux">
|
|
<syslibset libs="X11"/>
|
|
<syslibset libs="Xxf86vm" />
|
|
@@ -582,7 +594,7 @@
|
|
<target name="c.configure.freebsd.x86" if="isFreeBSDX86">
|
|
<echo message="FreeBSD.x86" />
|
|
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" />
|
|
- <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.nativewindow.x11" />
|
|
+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.x86.nativewindow.x11" />
|
|
</target>
|
|
|
|
<target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
|
|
@@ -590,8 +602,20 @@
|
|
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" />
|
|
<property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.amd64.nativewindow.x11" />
|
|
</target>
|
|
+
|
|
+ <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64">
|
|
+ <echo message="FreeBSD.Ppc64" />
|
|
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" />
|
|
+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64.nativewindow.x11" />
|
|
+ </target>
|
|
|
|
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
|
|
+ <target name="c.configure.freebsd.ppc64le" if="isFreeBSDPpc64le">
|
|
+ <echo message="FreeBSD.Ppc64le" />
|
|
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" />
|
|
+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64le.nativewindow.x11" />
|
|
+ </target>
|
|
+
|
|
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD" />
|
|
|
|
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
|
|
<echo message="HP-UX" />
|
|
--- jogl/make/build-newt.xml.orig 2015-10-10 01:08:14 UTC
|
|
+++ jogl/make/build-newt.xml
|
|
@@ -289,7 +289,7 @@
|
|
|
|
<!-- linker configuration -->
|
|
|
|
- <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd">
|
|
+ <linker id="linker.cfg.freebsd.x86.newt.x11" extends="linker.cfg.freebsd.x86">
|
|
<linkerarg value="-L/usr/local/lib"/>
|
|
<syslibset libs="X11"/>
|
|
<syslibset libs="Xrandr"/>
|
|
@@ -303,6 +303,20 @@
|
|
<syslibset libs="Xcursor"/>
|
|
</linker>
|
|
|
|
+ <linker id="linker.cfg.freebsd.ppc64.newt.x11" extends="linker.cfg.freebsd.ppc64">
|
|
+ <linkerarg value="-L/usr/local/lib"/>
|
|
+ <syslibset libs="X11"/>
|
|
+ <syslibset libs="Xrandr"/>
|
|
+ <syslibset libs="Xcursor"/>
|
|
+ </linker>
|
|
+
|
|
+ <linker id="linker.cfg.freebsd.ppc64le.newt.x11" extends="linker.cfg.freebsd.ppc64le">
|
|
+ <linkerarg value="-L/usr/local/lib"/>
|
|
+ <syslibset libs="X11"/>
|
|
+ <syslibset libs="Xrandr"/>
|
|
+ <syslibset libs="Xcursor"/>
|
|
+ </linker>
|
|
+
|
|
<linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux">
|
|
<syslibset libs="EGL"/>
|
|
<syslibset libs="GLES_CM"/>
|
|
@@ -560,8 +574,8 @@
|
|
<target name="c.configure.freebsd.x86" if="isFreeBSDX86">
|
|
<echo message="FreeBSD.x86" />
|
|
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" />
|
|
- <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.newt.x11"
|
|
- else="linker.cfg.freebsd">
|
|
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.x86.newt.x11"
|
|
+ else="linker.cfg.freebsd.x86">
|
|
<isset property="isX11" />
|
|
</condition>
|
|
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
|
|
@@ -577,7 +591,27 @@
|
|
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
|
|
</target>
|
|
|
|
- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/>
|
|
+ <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64">
|
|
+ <echo message="FreeBSD.Ppc64" />
|
|
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" />
|
|
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64.newt.x11"
|
|
+ else="linker.cfg.freebsd.ppc64">
|
|
+ <isset property="isX11" />
|
|
+ </condition>
|
|
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
|
|
+ </target>
|
|
+
|
|
+ <target name="c.configure.freebsd.ppc64le" if="isFreeBSDPpc64le">
|
|
+ <echo message="FreeBSD.Ppc64le" />
|
|
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" />
|
|
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64le.newt.x11"
|
|
+ else="linker.cfg.freebsd.ppc64le">
|
|
+ <isset property="isX11" />
|
|
+ </condition>
|
|
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
|
|
+ </target>
|
|
+
|
|
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD"/>
|
|
|
|
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
|
|
<echo message="HP-UX" />
|