Group :: Networking/Instant messaging
RPM: jitsi
Navigation
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: jitsi-2.11-alt-build-native-modules.patch
Download
Download
diff -up ./build.xml.orig ./build.xml
--- ./build.xml.orig 2017-02-02 21:00:19.000000000 +0000
+++ ./build.xml 2018-10-23 18:03:51.089928205 +0000
@@ -106,7 +106,12 @@
value="${lib}/native/linux-64:${system.LD_LIBRARY_PATH}"><and>
<isset property="is.running.linux"/>
- <os arch="amd64" />
+ <or>
+ <os arch="aarch64" />
+ <os arch="amd64" />
+ <os arch="x86_64" />
+ <os arch="ppc64le" />
+ </or>
</and>
</condition>
<!-- otherwise we go for the normal linuxnatives (i.e. os.arch==i386)-->
diff -up ./src/native/build.xml.orig ./src/native/build.xml
--- ./src/native/build.xml.orig 2016-06-23 04:27:30.000000000 +0000
+++ ./src/native/build.xml 2018-10-23 18:51:10.455400369 +0000
@@ -19,10 +19,13 @@
<os arch="i486" />
<os arch="i586" />
<os arch="i686" />
+ <os arch="arm" />
</or>
</condition>
<condition property="arch" value="64">
<or>
+ <os arch="aarch64" />
+ <os arch="ppc64le" />
<os arch="amd64" />
<os arch="x86_64" />
</or>
@@ -33,6 +35,7 @@
binaries on a 64-bit host. It is also used to compile ffmpeg on Mac OS X for
each architecture before creating an universal binary with the lipo tool.
-->
+ <!--
<condition property="cross_32" value="y" >
<equals arg1="${arch}" arg2="32" /></condition>
@@ -40,7 +43,8 @@
<condition property="cross_64" value="y" >
<equals arg1="${arch}" arg2="64" /></condition>
-
+ -->
+
<!-- Mac OS X only -->
<condition property="cross_ppc" value="y" >
<equals arg1="${arch}" arg2="ppc" />@@ -91,6 +95,15 @@
</and>
</condition>
+ <!-- Mageia -->
+ <property name="mageia-release" value="/etc/altlinux-release"/>
+ <condition property="is.running.mageia">
+ <and>
+ <isset property="is.running.linux"/>
+ <available file="${mageia-release}"/>+ </and>
+ </condition>
+
<!--
<echo message="ffmpeg library: ${ffmpeg}" /> <echo message="x264 library: ${x264}" />@@ -111,20 +124,30 @@
<!-- common compiler flags -->
<compilerarg value="-std=c99" />
<compilerarg value="-D_XOPEN_SOURCE=600" />
- <compilerarg value="-Wall" />
- <compilerarg value="-Wextra" />
- <compilerarg value="-O3" />
+ <compilerarg value="-O2" if="is.running.mageia" />
+ <compilerarg value="-g" if="is.running.mageia" />
+ <compilerarg value="-pipe" if="is.running.mageia" />
+ <compilerarg value="-Wformat" if="is.running.mageia" />
+ <compilerarg value="-Werror=format-security" if="is.running.mageia" />
+ <compilerarg value="-Wp,-D_FORTIFY_SOURCE=2" if="is.running.mageia" />
+ <compilerarg value="-fstack-protector" if="is.running.mageia" />
+ <compilerarg value="--param=ssp-buffer-size=4" if="is.running.mageia" />
+ <compilerarg value="-fasynchronous-unwind-tables" if="is.running.mageia" />
<!-- Linux specific flags -->
<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />
<compilerarg value="-m64" if="cross_64" unless="is.running.macos" />
<compilerarg value="-I${system.JAVA_HOME}/include" if="is.running.linux" /> <compilerarg value="-I${system.JAVA_HOME}/include/linux" if="is.running.linux" />- <compilerarg value="-D_FORTIFY_SOURCE=2" if="is.running.debian"/>
<linkerarg value="-m32" if="cross_32" unless="is.running.macos" />
<linkerarg value="-m64" if="cross_64" unless="is.running.macos" />
- <linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
+ <linkerarg value="-Wl,--as-needed" if="is.running.mageia" />
+ <linkerarg value="-Wl,--no-undefined" if="is.running.mageia" />
+ <linkerarg value="-Wl,-z,relro" if="is.running.mageia" />
+ <linkerarg value="-Wl,-O1" if="is.running.mageia" />
+ <linkerarg value="-Wl,--build-id" if="is.running.mageia" />
+ <linkerarg value="-Wl,--enable-new-dtags" if="is.running.mageia" />
<linkerarg value="-lX11" location="end" if="is.running.linux" />
<!-- Mac OS X specific flags -->
@@ -158,8 +181,15 @@
depends="init-native">
<cc outtype="shared" name="gcc" outfile="${native_install_dir}/hid" objdir="${obj}"><!-- common compiler flags -->
- <compilerarg value="-Wall" />
- <compilerarg value="-Wextra" />
+ <compilerarg value="-O2" if="is.running.mageia" />
+ <compilerarg value="-g" if="is.running.mageia" />
+ <compilerarg value="-pipe" if="is.running.mageia" />
+ <compilerarg value="-Wformat" if="is.running.mageia" />
+ <compilerarg value="-Werror=format-security" if="is.running.mageia" />
+ <compilerarg value="-Wp,-D_FORTIFY_SOURCE=2" if="is.running.mageia" />
+ <compilerarg value="-fstack-protector" if="is.running.mageia" />
+ <compilerarg value="--param=ssp-buffer-size=4" if="is.running.mageia" />
+ <compilerarg value="-fasynchronous-unwind-tables" if="is.running.mageia" />
<!-- Linux specific flags -->
<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />
@@ -169,8 +199,15 @@
<linkerarg value="-m32" if="cross_32" unless="is.running.macos" />
<linkerarg value="-m64" if="cross_64" unless="is.running.macos" />
+
+ <linkerarg value="-Wl,--as-needed" if="is.running.mageia" />
+ <linkerarg value="-Wl,--no-undefined" if="is.running.mageia" />
+ <linkerarg value="-Wl,-z,relro" if="is.running.mageia" />
+ <linkerarg value="-Wl,-O1" if="is.running.mageia" />
+ <linkerarg value="-Wl,--build-id" if="is.running.mageia" />
+ <linkerarg value="-Wl,--enable-new-dtags" if="is.running.mageia" />
<linkerarg value="-lX11" location="end" if="is.running.linux" />
- <linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
+ <linkerarg value="-lXtst" location="end" if="is.running.linux" />
<fileset dir="${src}/native/hid" includes="net*.c KeyboardUtil_unix.c" if="is.running.linux" />@@ -209,14 +246,15 @@
unless="is.running.windows">
<cc outtype="shared" name="gcc" outfile="${native_install_dir}/hwaddressretriever" objdir="${obj}"><!-- common compiler flags -->
- <compilerarg value="-D_FORTIFY_SOURCE=2" if="is.running.debian"/>
- <compilerarg value="-Wall" />
- <compilerarg value="-O2" />
- <compilerarg value="-g" />
- <compilerarg value="-fstack-protector" if="is.running.debian"/>
- <compilerarg value="--param=ssp-buffer-size=4" if="is.running.debian"/>
- <compilerarg value="-Werror=format-security" if="is.running.debian"/>
- <compilerarg value="-Wformat" if="is.running.debian"/>
+ <compilerarg value="-O2" if="is.running.mageia" />
+ <compilerarg value="-g" if="is.running.mageia" />
+ <compilerarg value="-pipe" if="is.running.mageia" />
+ <compilerarg value="-Wformat" if="is.running.mageia" />
+ <compilerarg value="-Werror=format-security" if="is.running.mageia" />
+ <compilerarg value="-Wp,-D_FORTIFY_SOURCE=2" if="is.running.mageia" />
+ <compilerarg value="-fstack-protector" if="is.running.mageia" />
+ <compilerarg value="--param=ssp-buffer-size=4" if="is.running.mageia" />
+ <compilerarg value="-fasynchronous-unwind-tables" if="is.running.mageia" />
<fileset dir="${src}/native/hwaddressretriever" includes="net*.c HardwareAddressRetriever_unix.c" />@@ -228,7 +266,12 @@
<linkerarg value="-m32" if="cross_32" unless="is.running.macos" />
<linkerarg value="-m64" if="cross_64" unless="is.running.macos" />
- <linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
+ <linkerarg value="-Wl,--as-needed" if="is.running.mageia" />
+ <linkerarg value="-Wl,--no-undefined" if="is.running.mageia" />
+ <linkerarg value="-Wl,-z,relro" if="is.running.mageia" />
+ <linkerarg value="-Wl,-O1" if="is.running.mageia" />
+ <linkerarg value="-Wl,--build-id" if="is.running.mageia" />
+ <linkerarg value="-Wl,--enable-new-dtags" if="is.running.mageia" />
<!-- Mac OS X specific flags -->
<compilerarg value="-mmacosx-version-min=10.5" if="is.running.macos"/>
@@ -263,12 +306,18 @@
depends="init-native">
<cc outtype="shared" name="gcc" outfile="${native_install_dir}/galagonotification" objdir="${obj}"><compilerarg value="-std=c99" />
- <compilerarg value="-Wall" />
- <compilerarg value="-O2" />
+ <compilerarg value="-O2" if="is.running.mageia" />
+ <compilerarg value="-g" if="is.running.mageia" />
+ <compilerarg value="-pipe" if="is.running.mageia" />
+ <compilerarg value="-Wformat" if="is.running.mageia" />
+ <compilerarg value="-Werror=format-security" if="is.running.mageia" />
+ <compilerarg value="-Wp,-D_FORTIFY_SOURCE=2" if="is.running.mageia" />
+ <compilerarg value="-fstack-protector" if="is.running.mageia" />
+ <compilerarg value="--param=ssp-buffer-size=4" if="is.running.mageia" />
+ <compilerarg value="-fasynchronous-unwind-tables" if="is.running.mageia" />
<compilerarg value="-I/usr/include/dbus-1.0" />
<compilerarg value="-I/usr/lib/dbus-1.0/include" />
- <compilerarg value="-I/usr/lib/x86_64-linux-gnu/dbus-1.0/include" />
- <compilerarg value="-I/usr/lib/i386-linux-gnu/dbus-1.0/include" />
+ <compilerarg value="-I/usr/lib64/dbus-1.0/include" />
<compilerarg value="-m32" if="cross_32" />
<compilerarg value="-m64" if="cross_64" />
<compilerarg value="-I${system.JAVA_HOME}/include" />@@ -276,10 +325,13 @@
<linkerarg value="-m32" if="cross_32" />
<linkerarg value="-m64" if="cross_64" />
- <linkerarg value="-ldbus-1" location="end" />
- <linkerarg value="-Wl,--as-needed" location="end" />
- <linkerarg value="-Wl,-z,defs" location="end" />
- <linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
+ <linkerarg value="-ldbus-1" location="end" if="is.running.linux" />
+ <linkerarg value="-Wl,--as-needed" if="is.running.mageia" />
+ <linkerarg value="-Wl,--no-undefined" if="is.running.mageia" />
+ <linkerarg value="-Wl,-z,relro" if="is.running.mageia" />
+ <linkerarg value="-Wl,-O1" if="is.running.mageia" />
+ <linkerarg value="-Wl,--build-id" if="is.running.mageia" />
+ <linkerarg value="-Wl,--enable-new-dtags" if="is.running.mageia" />
<fileset dir="${src}/native/linux/galagonotification" includes="*.c"/></cc>
@@ -359,14 +411,26 @@
<compilerarg value="-D_JNI_IMPLEMENTATION_" />
<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />
<compilerarg value="-m64" if="cross_64" unless="is.running.macos" />
- <compilerarg value="-O2" />
- <compilerarg value="-Wall" />
- <compilerarg value="-Wextra" />
- <compilerarg value="-Wno-unused-parameter" />
+ <compilerarg value="-Wno-unused-parameter" />
+ <compilerarg value="-O2" if="is.running.mageia" />
+ <compilerarg value="-g" if="is.running.mageia" />
+ <compilerarg value="-pipe" if="is.running.mageia" />
+ <compilerarg value="-Wformat" if="is.running.mageia" />
+ <compilerarg value="-Werror=format-security" if="is.running.mageia" />
+ <compilerarg value="-Wp,-D_FORTIFY_SOURCE=2" if="is.running.mageia" />
+ <compilerarg value="-fstack-protector" if="is.running.mageia" />
+ <compilerarg value="--param=ssp-buffer-size=4" if="is.running.mageia" />
+ <compilerarg value="-fasynchronous-unwind-tables" if="is.running.mageia" />
<!-- Common linker flags -->
<linkerarg value="-m32" if="cross_32" unless="is.running.macos" />
<linkerarg value="-m64" if="cross_64" unless="is.running.macos" />
+ <linkerarg value="-Wl,--as-needed" if="is.running.mageia" />
+ <linkerarg value="-Wl,--no-undefined" if="is.running.mageia" />
+ <linkerarg value="-Wl,-z,relro" if="is.running.mageia" />
+ <linkerarg value="-Wl,-O1" if="is.running.mageia" />
+ <linkerarg value="-Wl,--build-id" if="is.running.mageia" />
+ <linkerarg value="-Wl,--enable-new-dtags" if="is.running.mageia" />
<!-- Mac OS X-specific flags -->
<compilerarg value="-mmacosx-version-min=10.5" if="is.running.macos"/>
@@ -398,17 +462,15 @@
<compilerarg value="-I/usr/include/gdk-pixbuf-2.0/" if="is.running.linux" />
<compilerarg value="-I/usr/lib/glib-2.0/include/" if="is.running.linux" />
<compilerarg value="-I/usr/lib/gtk-2.0/include/" if="is.running.linux" />
- <compilerarg value="-I/usr/lib/x86_64-linux-gnu/glib-2.0/include" if="is.running.linux" />
- <compilerarg value="-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include" if="is.running.linux" />
- <compilerarg value="-I/usr/lib/i386-linux-gnu/glib-2.0/include" if="is.running.linux" />
- <compilerarg value="-I/usr/lib/i386-linux-gnu/gtk-2.0/include" if="is.running.linux" />
+ <compilerarg value="-I/usr/lib64/glib-2.0/include" if="is.running.linux" />
+ <compilerarg value="-I/usr/lib64/gtk-2.0/include" if="is.running.linux" />
<compilerarg value="-I${system.JAVA_HOME}/include" if="is.running.linux" /> <compilerarg value="-I${system.JAVA_HOME}/include/linux" if="is.running.linux" />- <linkerarg value="-lgdk-x11-2.0" if="is.running.linux" location="end" />
- <linkerarg value="-lXss" if="is.running.linux" location="end" />
- <linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
+ <linkerarg value="-lgdk-x11-2.0" location="end" if="is.running.linux" />
+ <linkerarg value="-lXss" location="end" if="is.running.linux" />
+ <linkerarg value="-lX11" location="end" if="is.running.linux" />
<fileset dir="${src}/native/sysactivity" includes="*.c" if="is.running.linux" />@@ -460,8 +521,15 @@
<cc outtype="shared" name="gcc" outfile="${native_install_dir}/globalshortcut" objdir="${obj}"><!-- common compiler flags -->
- <compilerarg value="-Wall" />
- <compilerarg value="-Wextra" />
+ <compilerarg value="-O2" if="is.running.mageia" />
+ <compilerarg value="-g" if="is.running.mageia" />
+ <compilerarg value="-pipe" if="is.running.mageia" />
+ <compilerarg value="-Wformat" if="is.running.mageia" />
+ <compilerarg value="-Werror=format-security" if="is.running.mageia" />
+ <compilerarg value="-Wp,-D_FORTIFY_SOURCE=2" if="is.running.mageia" />
+ <compilerarg value="-fstack-protector" if="is.running.mageia" />
+ <compilerarg value="--param=ssp-buffer-size=4" if="is.running.mageia" />
+ <compilerarg value="-fasynchronous-unwind-tables" if="is.running.mageia" />
<compilerarg value="-m32" if="cross_32" unless="is.running.macos" />
<compilerarg value="-m64" if="cross_64" unless="is.running.macos" />
@@ -501,9 +569,15 @@
<linkerarg value="-m32" if="cross_32" unless="is.running.macos" />
<linkerarg value="-m64" if="cross_64" unless="is.running.macos" />
- <linkerarg value="-lX11" if="is.running.linux" />
- <linkerarg value="-lstdc++" if="is.running.linux" />
- <linkerarg value="-Wl,-z,relro" if="is.running.debian"/>
+ <linkerarg value="-Wl,--as-needed" if="is.running.mageia" />
+ <linkerarg value="-Wl,--no-undefined" if="is.running.mageia" />
+ <linkerarg value="-Wl,-z,relro" if="is.running.mageia" />
+ <linkerarg value="-Wl,-O1" if="is.running.mageia" />
+ <linkerarg value="-Wl,--build-id" if="is.running.mageia" />
+ <linkerarg value="-Wl,--enable-new-dtags" if="is.running.mageia" />
+ <linkerarg value="-lpthread" location="end" if="is.running.linux" />
+ <linkerarg value="-lX11" location="end" if="is.running.linux" />
+ <linkerarg value="-lstdc++" location="end" if="is.running.linux" />
</cc>
</target>