← Back to branch summary

~ubuntu-branches/ubuntu/utopic/simgrid/utopic

« back to all changes in this revision

Viewing changes to debian/patches/fix-java-multiple-definitions.diff

  • Committer: Package Import Robot
  • Author(s): Martin Quinson
  • Date: 2014-07-05 00:20:25 UTC
  • mfrom: (10.1.19 sid)
  • Revision ID: package-import@ubuntu.com-20140705002025-9zby3lb11xd86slu
Tags: 3.11.1-7
* Disable LTO on all non-AMD architectures to circumvent a seemingly
  bug in gcc 4.9.
* Re-enable parallel builds now that LTO issues are (hopefully) fixed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-java-multiple-definitions.diff
 
1
commit df1ac93ee121b5cd14266476b07273c95a38a23c
 
2
Author: Augustin Degomme <augustin.degomme@imag.fr>
 
3
Date:   Thu Jun 26 17:09:30 2014 +0200
 
4
 
 
5
    JSURF_JAVA_GENERATED_SRC is already included in JMSG_JAVA_SRC
 
6
    Some architectures complain and fail build if duplicated files are found
 
7
 
 
8
diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake
 
9
index 7e0d62c..8a34726 100644
 
10
--- a/buildtools/Cmake/MakeJava.cmake
 
11
+++ b/buildtools/Cmake/MakeJava.cmake
 
12
@@ -78,9 +78,9 @@ endif()
 
13
 ##
 
14
 if(CMAKE_VERSION VERSION_LESS "2.8.12")
 
15
   set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid)
 
16
-  add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} ${JSURF_JAVA_GENERATED_SRC})
 
17
+  add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC})
 
18
 else()
 
19
-  add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} ${JSURF_JAVA_GENERATED_SRC} OUTPUT_NAME simgrid)
 
20
+  add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid)
 
21
 endif()
 
22
 
 
23
 set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/java_bundle.sh")