View | Details | Raw Unified | Return to bug 251929
Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 17-23 Link Here
17
BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt
17
BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt
18
RUN_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt
18
RUN_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt
19
19
20
ONLY_FOR_ARCHS=	i386 amd64 powerpc64
20
ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
21
21
22
USES=		compiler tar:xz xorg
22
USES=		compiler tar:xz xorg
23
23
(-)files/patch-freebsd (-24 / +63 lines)
Lines 22-39 Link Here
22
         <syslibset dir="/usr/local/lib" libs="X11"/>
22
         <syslibset dir="/usr/local/lib" libs="X11"/>
23
       </linker>
23
       </linker>
24
 
24
 
25
@@ -1211,6 +1211,10 @@
25
@@ -1211,6 +1211,14 @@
26
         <syslibset dir="/usr/local/lib" libs="X11"/>
26
         <syslibset dir="/usr/local/lib" libs="X11"/>
27
       </linker>
27
       </linker>
28
 
28
 
29
+      <linker id="linker.cfg.freebsd.ppc.jogl.x11" extends="linker.cfg.freebsd.ppc">
29
+      <linker id="linker.cfg.freebsd.ppc64.jogl.x11" extends="linker.cfg.freebsd.ppc64">
30
+        <syslibset dir="/usr/local/lib" libs="X11"/>
30
+        <syslibset dir="/usr/local/lib" libs="X11"/>
31
+      </linker>
31
+      </linker>
32
+
32
+
33
+      <linker id="linker.cfg.freebsd.ppc64le.jogl.x11" extends="linker.cfg.freebsd.ppc64le">
34
+        <syslibset dir="/usr/local/lib" libs="X11"/>
35
+      </linker>
36
+
33
       <linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux">
37
       <linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux">
34
         <syslibset libs="X11"/>
38
         <syslibset libs="X11"/>
35
       </linker>
39
       </linker>
36
@@ -1401,7 +1405,7 @@
40
@@ -1401,7 +1409,7 @@
37
     <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
41
     <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
38
       <echo message="FreeBSD" />
42
       <echo message="FreeBSD" />
39
       <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
43
       <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
Lines 42-59 Link Here
42
     </target>
46
     </target>
43
 
47
 
44
     <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
48
     <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
45
@@ -1410,7 +1414,13 @@
49
@@ -1410,7 +1418,19 @@
46
       <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.amd64.jogl.x11" />
50
       <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.amd64.jogl.x11" />
47
     </target>
51
     </target>
48
 
52
 
49
-    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
53
-    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
50
+    <target name="c.configure.freebsd.ppc" depends="c.configure.x11" if="isFreeBSDPpc">
54
+    <target name="c.configure.freebsd.ppc64" depends="c.configure.x11" if="isFreeBSDPpc64">
51
+      <echo message="FreeBSD" />
55
+      <echo message="FreeBSD" />
52
+      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
56
+      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
53
+      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.ppc.jogl.x11" />
57
+      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.ppc64.jogl.x11" />
54
+    </target>
58
+    </target>
55
+
59
+
56
+    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD" />
60
+    <target name="c.configure.freebsd.ppc64le" depends="c.configure.x11" if="isFreeBSDPpc64le">
61
+      <echo message="FreeBSD" />
62
+      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
63
+      <property name="linker.cfg.id.os"                    value="linker.cfg.freebsd.ppc64le.jogl.x11" />
64
+    </target>
65
+
66
+    <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" />
57
 
67
 
58
     <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
68
     <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
59
       <echo message="HP-UX" />
69
       <echo message="HP-UX" />
Lines 68-87 Link Here
68
         <syslibset dir="/usr/local/lib" libs="X11"/>
78
         <syslibset dir="/usr/local/lib" libs="X11"/>
69
         <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
79
         <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
70
         <syslibset dir="/usr/local/lib" libs="Xrender"/>
80
         <syslibset dir="/usr/local/lib" libs="Xrender"/>
71
@@ -385,6 +385,12 @@
81
@@ -385,6 +385,18 @@
72
         <syslibset dir="/usr/local/lib" libs="Xrender"/>
82
         <syslibset dir="/usr/local/lib" libs="Xrender"/>
73
       </linker>
83
       </linker>
74
 
84
 
75
+      <linker id="linker.cfg.freebsd.ppc.nativewindow.x11" extends="linker.cfg.freebsd.ppc">
85
+      <linker id="linker.cfg.freebsd.ppc64.nativewindow.x11" extends="linker.cfg.freebsd.ppc64">
76
+        <syslibset dir="/usr/local/lib" libs="X11" />
86
+        <syslibset dir="/usr/local/lib" libs="X11" />
77
+        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
87
+        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
78
+        <syslibset dir="/usr/local/lib" libs="Xrender"/>
88
+        <syslibset dir="/usr/local/lib" libs="Xrender"/>
79
+      </linker>
89
+      </linker>
80
+
90
+
91
+      <linker id="linker.cfg.freebsd.ppc64le.nativewindow.x11" extends="linker.cfg.freebsd.ppc64le">
92
+        <syslibset dir="/usr/local/lib" libs="X11" />
93
+        <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
94
+        <syslibset dir="/usr/local/lib" libs="Xrender"/>
95
+      </linker>
96
+
81
       <linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux">
97
       <linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux">
82
         <syslibset libs="X11"/>
98
         <syslibset libs="X11"/>
83
         <syslibset libs="Xxf86vm" />
99
         <syslibset libs="Xxf86vm" />
84
@@ -582,7 +588,7 @@
100
@@ -582,7 +594,7 @@
85
     <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
101
     <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
86
       <echo message="FreeBSD.x86" />
102
       <echo message="FreeBSD.x86" />
87
       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
103
       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
Lines 90-108 Link Here
90
     </target>
106
     </target>
91
     
107
     
92
     <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
108
     <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
93
@@ -590,8 +596,14 @@
109
@@ -590,8 +602,20 @@
94
       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
110
       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
95
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.amd64.nativewindow.x11" />
111
       <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.amd64.nativewindow.x11" />
96
     </target>
112
     </target>
97
+   
113
+   
98
+    <target name="c.configure.freebsd.ppc" if="isFreeBSDPpc">
114
+    <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64">
99
+      <echo message="FreeBSD.Ppc" />
115
+      <echo message="FreeBSD.Ppc64" />
100
+      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
116
+      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
101
+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.ppc.nativewindow.x11" />
117
+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.ppc64.nativewindow.x11" />
102
+    </target>
118
+    </target>
103
     
119
     
104
-    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
120
-    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
105
+    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD" />
121
+    <target name="c.configure.freebsd.ppc64le" if="isFreeBSDPpc64le">
122
+      <echo message="FreeBSD.Ppc64le" />
123
+      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.nativewindow" />
124
+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.freebsd.ppc64le.nativewindow.x11" />
125
+    </target>
126
+    
127
+    <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" />
106
 
128
 
107
     <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
129
     <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
108
       <echo message="HP-UX" />
130
       <echo message="HP-UX" />
Lines 117-127 Link Here
117
         <linkerarg value="-L/usr/local/lib"/>
139
         <linkerarg value="-L/usr/local/lib"/>
118
         <syslibset libs="X11"/>
140
         <syslibset libs="X11"/>
119
         <syslibset libs="Xrandr"/>
141
         <syslibset libs="Xrandr"/>
120
@@ -303,6 +303,13 @@
142
@@ -303,6 +303,20 @@
121
         <syslibset libs="Xcursor"/>
143
         <syslibset libs="Xcursor"/>
122
       </linker>
144
       </linker>
123
 
145
 
124
+      <linker id="linker.cfg.freebsd.ppc.newt.x11" extends="linker.cfg.freebsd.ppc">
146
+      <linker id="linker.cfg.freebsd.ppc64.newt.x11" extends="linker.cfg.freebsd.ppc64">
125
+        <linkerarg value="-L/usr/local/lib"/>
147
+        <linkerarg value="-L/usr/local/lib"/>
126
+        <syslibset libs="X11"/>
148
+        <syslibset libs="X11"/>
127
+        <syslibset libs="Xrandr"/>
149
+        <syslibset libs="Xrandr"/>
Lines 128-137 Link Here
128
+        <syslibset libs="Xcursor"/>
150
+        <syslibset libs="Xcursor"/>
129
+      </linker>
151
+      </linker>
130
+
152
+
153
+      <linker id="linker.cfg.freebsd.ppc64le.newt.x11" extends="linker.cfg.freebsd.ppc64le">
154
+        <linkerarg value="-L/usr/local/lib"/>
155
+        <syslibset libs="X11"/>
156
+        <syslibset libs="Xrandr"/>
157
+        <syslibset libs="Xcursor"/>
158
+      </linker>
159
+
131
       <linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux">
160
       <linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux">
132
         <syslibset libs="EGL"/>
161
         <syslibset libs="EGL"/>
133
         <syslibset libs="GLES_CM"/>
162
         <syslibset libs="GLES_CM"/>
134
@@ -560,8 +567,8 @@
163
@@ -560,8 +574,8 @@
135
     <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
164
     <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
136
       <echo message="FreeBSD.x86" />
165
       <echo message="FreeBSD.x86" />
137
       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
166
       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
Lines 142-163 Link Here
142
           <isset property="isX11" />
171
           <isset property="isX11" />
143
       </condition>
172
       </condition>
144
       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
173
       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
145
@@ -577,7 +584,17 @@
174
@@ -577,7 +591,27 @@
146
       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
175
       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
147
     </target>
176
     </target>
148
 
177
 
149
-    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/>
178
-    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/>
150
+    <target name="c.configure.freebsd.ppc" if="isFreeBSDPpc">
179
+    <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64">
151
+      <echo message="FreeBSD.Ppc" />
180
+      <echo message="FreeBSD.Ppc64" />
152
+      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
181
+      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
153
+      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.ppc.newt.x11"
182
+      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.ppc64.newt.x11"
154
+                                                            else="linker.cfg.freebsd.ppc">
183
+                                                            else="linker.cfg.freebsd.ppc64">
155
+          <isset property="isX11" />
184
+          <isset property="isX11" />
156
+      </condition>
185
+      </condition>
157
+      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
186
+      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
158
+    </target>
187
+    </target>
159
+
188
+
160
+    <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc,c.configure.x11" if="isFreeBSD"/>
189
+    <target name="c.configure.freebsd.ppc64le" if="isFreeBSDPpc64le">
190
+      <echo message="FreeBSD.Ppc64le" />
191
+      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.newt" />
192
+      <condition property="linker.cfg.id.oswin"             value="linker.cfg.freebsd.ppc64le.newt.x11"
193
+                                                            else="linker.cfg.freebsd.ppc64le">
194
+          <isset property="isX11" />
195
+      </condition>
196
+      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
197
+    </target>
198
+
199
+    <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"/>
161
 
200
 
162
     <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
201
     <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
163
       <echo message="HP-UX" />
202
       <echo message="HP-UX" />
(-)files/patch-gluegen2 (-10 / +17 lines)
Lines 1-25 Link Here
1
--- gluegen/make/build.xml.orig	2015-10-09 04:18:28 UTC
1
--- gluegen/make/build.xml.orig	2015-10-09 04:18:28 UTC
2
+++ gluegen/make/build.xml
2
+++ gluegen/make/build.xml
3
@@ -375,10 +375,17 @@
3
@@ -375,10 +375,24 @@
4
       <property name="c.src.dir.os"                         value="unix" />
4
       <property name="c.src.dir.os"                         value="unix" />
5
     </target>
5
     </target>
6
 
6
 
7
-    <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64" if="isFreeBSD" >
7
-    <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64" if="isFreeBSD" >
8
+    <target name="declare.freebsd.ppc" if="isFreeBSDPpc">
8
+    <target name="declare.freebsd.ppc64" if="isFreeBSDPpc64">
9
+      <echo message="FreeBSDPpc" />
9
+      <echo message="FreeBSDPpc64" />
10
+      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd" />
10
+      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd" />
11
+      <property name="linker.cfg.id"                        value="linker.cfg.freebsd.ppc" />
11
+      <property name="linker.cfg.id"                        value="linker.cfg.freebsd.ppc64" />
12
       <property name="c.src.dir.os"                         value="unix" />
12
       <property name="c.src.dir.os"                         value="unix" />
13
     </target>
13
     </target>
14
 
14
 
15
+    <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64,declare.freebsd.ppc" if="isFreeBSD" >
15
+    <target name="declare.freebsd.ppc64le" if="isFreeBSDPpc64le">
16
+      <echo message="FreeBSDPpc64le" />
17
+      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd" />
18
+      <property name="linker.cfg.id"                        value="linker.cfg.freebsd.ppc64le" />
16
+      <property name="c.src.dir.os"                         value="unix" />
19
+      <property name="c.src.dir.os"                         value="unix" />
17
+    </target>
20
+    </target>
18
+
21
+
22
+    <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64,declare.freebsd.ppc64,declare.freebsd.ppc64le" if="isFreeBSD" >
23
+      <property name="c.src.dir.os"                         value="unix" />
24
+    </target>
25
+
19
     <target name="declare.hpux" if="isHPUX">
26
     <target name="declare.hpux" if="isHPUX">
20
       <echo message="HP-UX" />
27
       <echo message="HP-UX" />
21
       <property name="compiler.cfg.id"                      value="compiler.cfg.hpux" />
28
       <property name="compiler.cfg.id"                      value="compiler.cfg.hpux" />
22
@@ -408,7 +415,7 @@
29
@@ -408,7 +422,7 @@
23
       <property name="c.compiler.src.files.common" value="src/native/common/*.c" />
30
       <property name="c.compiler.src.files.common" value="src/native/common/*.c" />
24
       <property name="c.compiler.src.files.os" value="src/native/${c.src.dir.os}/*.c" />
31
       <property name="c.compiler.src.files.os" value="src/native/${c.src.dir.os}/*.c" />
25
 
32
 
Lines 28-34 Link Here
28
       <condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition>
35
       <condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition>
29
       <condition property="output.lib.name.os" value="${output.lib.name}.dll"><isset property="isWindows"/></condition>
36
       <condition property="output.lib.name.os" value="${output.lib.name}.dll"><isset property="isWindows"/></condition>
30
       <condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition>
37
       <condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition>
31
@@ -605,7 +612,7 @@
38
@@ -605,7 +619,7 @@
32
         <srcfiles dir= "${src.jcpp}"  includes="**"/>
39
         <srcfiles dir= "${src.jcpp}"  includes="**"/>
33
         <srcfiles dir= "${c.grammar}" includes="*.g"/>
40
         <srcfiles dir= "${c.grammar}" includes="*.g"/>
34
         <srcfiles dir= "${j.grammar}" includes="*.g"/>
41
         <srcfiles dir= "${j.grammar}" includes="*.g"/>
Lines 37-43 Link Here
37
       </uptodate>
44
       </uptodate>
38
       <uptodate property="gluegen.build.skip.java2">
45
       <uptodate property="gluegen.build.skip.java2">
39
         <srcfiles dir= "."            includes="*.xml"/>
46
         <srcfiles dir= "."            includes="*.xml"/>
40
@@ -613,7 +620,7 @@
47
@@ -613,7 +627,7 @@
41
         <srcfiles dir= "${src.jcpp}"  includes="**"/>
48
         <srcfiles dir= "${src.jcpp}"  includes="**"/>
42
         <srcfiles dir= "${c.grammar}" includes="*.g"/>
49
         <srcfiles dir= "${c.grammar}" includes="*.g"/>
43
         <srcfiles dir= "${j.grammar}" includes="*.g"/>
50
         <srcfiles dir= "${j.grammar}" includes="*.g"/>
Lines 46-52 Link Here
46
       </uptodate>
53
       </uptodate>
47
       <condition property="gluegen.build.skip.java" value="true">
54
       <condition property="gluegen.build.skip.java" value="true">
48
         <or>
55
         <or>
49
@@ -763,7 +770,7 @@
56
@@ -763,7 +777,7 @@
50
     </copy>
57
     </copy>
51
 
58
 
52
     <!-- Build gluegen.jar. -->
59
     <!-- Build gluegen.jar. -->
Lines 55-61 Link Here
55
       <service type="javax.annotation.processing.Processor">
62
       <service type="javax.annotation.processing.Processor">
56
         <provider classname="com.jogamp.gluegen.structgen.CStructAnnotationProcessor"/>
63
         <provider classname="com.jogamp.gluegen.structgen.CStructAnnotationProcessor"/>
57
       </service>
64
       </service>
58
@@ -842,7 +849,7 @@
65
@@ -842,7 +856,7 @@
59
     </copy>
66
     </copy>
60
 
67
 
61
     <!-- Build gluegen-rt.jar. -->
68
     <!-- Build gluegen-rt.jar. -->
(-)files/patch-gluegen_make_gluegen-cpptasks-base.xml (-15 / +37 lines)
Lines 1-64 Link Here
1
--- gluegen/make/gluegen-cpptasks-base.xml.orig	2020-12-15 14:25:42 UTC
1
--- gluegen/make/gluegen-cpptasks-base.xml.orig	2015-10-09 04:18:28 UTC
2
+++ gluegen/make/gluegen-cpptasks-base.xml
2
+++ gluegen/make/gluegen-cpptasks-base.xml
3
@@ -317,6 +317,12 @@
3
@@ -317,6 +317,18 @@
4
         <istrue value="${isAMD64}" />
4
         <istrue value="${isAMD64}" />
5
       </and>
5
       </and>
6
     </condition>
6
     </condition>
7
+    <condition property="isFreeBSDPpc">
7
+    <condition property="isFreeBSDPpc64">
8
+      <and>
8
+      <and>
9
+        <istrue value="${isFreeBSD}" />
9
+        <istrue value="${isFreeBSD}" />
10
+        <os arch="ppc64" />
10
+        <os arch="ppc64" />
11
+      </and>
11
+      </and>
12
+    </condition>
12
+    </condition>
13
+    <condition property="isFreeBSDPpc64le">
14
+      <and>
15
+        <istrue value="${isFreeBSD}" />
16
+        <os arch="ppc64le" />
17
+      </and>
18
+    </condition>
13
     <condition property="isHPUX">
19
     <condition property="isHPUX">
14
       <os name="HP-UX" />
20
       <os name="HP-UX" />
15
     </condition>
21
     </condition>
16
@@ -581,6 +587,7 @@
22
@@ -581,6 +593,8 @@
17
     <echo message="FreeBSD=${isFreeBSD}" />
23
     <echo message="FreeBSD=${isFreeBSD}" />
18
     <echo message="FreeBSDX86=${isFreeBSDX86}" />
24
     <echo message="FreeBSDX86=${isFreeBSDX86}" />
19
     <echo message="FreeBSDAMD64=${isFreeBSDAMD64}" />
25
     <echo message="FreeBSDAMD64=${isFreeBSDAMD64}" />
20
+    <echo message="FreeBSDPpc=${isFreeBSDPpc}" />
26
+    <echo message="FreeBSDPpc64=${isFreeBSDPpc64}" />
27
+    <echo message="FreeBSDPpc64le=${isFreeBSDPpc64le}" />
21
     <echo message="HPUX=${isHPUX}" />
28
     <echo message="HPUX=${isHPUX}" />
22
     <echo message="IA64=${isIA64}" />
29
     <echo message="IA64=${isIA64}" />
23
     <echo message="Android=${isAndroid}" />
30
     <echo message="Android=${isAndroid}" />
24
@@ -633,8 +640,12 @@
31
@@ -633,8 +647,16 @@
25
     <property name="os.and.arch" value="freebsd-amd64" />
32
     <property name="os.and.arch" value="freebsd-amd64" />
26
   </target>
33
   </target>
27
 
34
 
28
-  <target name="gluegen.cpptasks.detect.os.freebsd" depends="gluegen.cpptasks.detect.os.freebsd.amd64,gluegen.cpptasks.detect.os.freebsd.x86" unless="gluegen.cpptasks.detected.os.2" />
35
-  <target name="gluegen.cpptasks.detect.os.freebsd" depends="gluegen.cpptasks.detect.os.freebsd.amd64,gluegen.cpptasks.detect.os.freebsd.x86" unless="gluegen.cpptasks.detected.os.2" />
29
+  <target name="gluegen.cpptasks.detect.os.freebsd.ppc" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDPpc">
36
+  <target name="gluegen.cpptasks.detect.os.freebsd.ppc64" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDPpc64">
30
+    <property name="os.and.arch" value="freebsd-ppc" />
37
+    <property name="os.and.arch" value="freebsd-ppc64" />
31
+  </target>
38
+  </target>
32
 
39
 
33
+  <target name="gluegen.cpptasks.detect.os.freebsd" depends="gluegen.cpptasks.detect.os.freebsd.amd64,gluegen.cpptasks.detect.os.freebsd.x86,gluegen.cpptasks.detect.os.freebsd.ppc" unless="gluegen.cpptasks.detected.os.2" />
40
+  <target name="gluegen.cpptasks.detect.os.freebsd.ppc64le" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDPpc64le">
41
+    <property name="os.and.arch" value="freebsd-ppc64le" />
42
+  </target>
34
+
43
+
44
+  <target name="gluegen.cpptasks.detect.os.freebsd" depends="gluegen.cpptasks.detect.os.freebsd.amd64,gluegen.cpptasks.detect.os.freebsd.x86,gluegen.cpptasks.detect.os.freebsd.ppc64,gluegen.cpptasks.detect.os.freebsd.ppc64le" unless="gluegen.cpptasks.detected.os.2" />
45
+
35
   <target name="gluegen.cpptasks.detect.os.hpux" unless="gluegen.cpptasks.detected.os.2" if="isHPUX">
46
   <target name="gluegen.cpptasks.detect.os.hpux" unless="gluegen.cpptasks.detected.os.2" if="isHPUX">
36
     <property name="os.and.arch" value="hpux-hppa" />
47
     <property name="os.and.arch" value="hpux-hppa" />
37
   </target>
48
   </target>
38
@@ -1292,6 +1303,10 @@
49
@@ -1292,6 +1314,14 @@
39
       <linkerarg value="-m64"/>
50
       <linkerarg value="-m64"/>
40
     </linker>
51
     </linker>
41
 
52
 
42
+    <linker id="linker.cfg.freebsd.ppc" name="${gcc.compat.compiler}">
53
+    <linker id="linker.cfg.freebsd.ppc64" name="${gcc.compat.compiler}">
43
+      <linkerarg value="-m64"/>
54
+      <linkerarg value="-m64"/>
44
+    </linker>
55
+    </linker>
45
+
56
+
57
+    <linker id="linker.cfg.freebsd.ppc64le" name="${gcc.compat.compiler}">
58
+      <linkerarg value="-m64"/>
59
+    </linker>
60
+
46
     <!-- SOLARIS linker configuration --> 
61
     <!-- SOLARIS linker configuration --> 
47
 
62
 
48
     <linker id="linker.cfg.solaris" name="${gcc.compat.compiler}"> 
63
     <linker id="linker.cfg.solaris" name="${gcc.compat.compiler}"> 
49
@@ -1580,7 +1595,14 @@
64
@@ -1580,7 +1610,21 @@
50
       <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/amd64" />
65
       <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/amd64" />
51
     </target>
66
     </target>
52
 
67
 
53
-    <target name="gluegen.cpptasks.declare.compiler.freebsd" depends="gluegen.cpptasks.declare.compiler.freebsd.x86,gluegen.cpptasks.declare.compiler.freebsd.amd64" if="isFreeBSD">
68
-    <target name="gluegen.cpptasks.declare.compiler.freebsd" depends="gluegen.cpptasks.declare.compiler.freebsd.x86,gluegen.cpptasks.declare.compiler.freebsd.amd64" if="isFreeBSD">
54
+    <target name="gluegen.cpptasks.declare.compiler.freebsd.ppc" if="isFreeBSDPpc">
69
+    <target name="gluegen.cpptasks.declare.compiler.freebsd.ppc64" if="isFreeBSDPpc64">
55
+      <echo message="FreeBSD" />
70
+      <echo message="FreeBSD" />
56
+      <property name="compiler.cfg.id.base"          value="compiler.cfg.freebsd" />
71
+      <property name="compiler.cfg.id.base"          value="compiler.cfg.freebsd" />
57
+      <property name="linker.cfg.id.base"            value="linker.cfg.freebsd.ppc" />
72
+      <property name="linker.cfg.id.base"            value="linker.cfg.freebsd.ppc64" />
58
+      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/ppc64" />
73
+      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/ppc64" />
59
+    </target>
74
+    </target>
60
+
75
+
61
+    <target name="gluegen.cpptasks.declare.compiler.freebsd" depends="gluegen.cpptasks.declare.compiler.freebsd.x86,gluegen.cpptasks.declare.compiler.freebsd.amd64,gluegen.cpptasks.declare.compiler.freebsd.ppc" if="isFreeBSD">
76
+    <target name="gluegen.cpptasks.declare.compiler.freebsd.ppc64le" if="isFreeBSDPpc64le">
77
+      <echo message="FreeBSD" />
78
+      <property name="compiler.cfg.id.base"          value="compiler.cfg.freebsd" />
79
+      <property name="linker.cfg.id.base"            value="linker.cfg.freebsd.ppc64le" />
80
+      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/ppc64le" />
81
+    </target>
82
+
83
+    <target name="gluegen.cpptasks.declare.compiler.freebsd" depends="gluegen.cpptasks.declare.compiler.freebsd.x86,gluegen.cpptasks.declare.compiler.freebsd.amd64,gluegen.cpptasks.declare.compiler.freebsd.ppc64,gluegen.cpptasks.declare.compiler.freebsd.ppc64le" if="isFreeBSD">
62
       <property name="java.includes.dir.platform"    value="${java.includes.dir}/x11" />
84
       <property name="java.includes.dir.platform"    value="${java.includes.dir}/x11" />
63
     </target>
85
     </target>
64
 
86
 

Return to bug 251929