Hi!
On 3/8/20 11:33 PM, John Paul Adrian Glaubitz wrote:
> In fact, this whitelist shouldn't be necessary at all and Java should just
> be enabled for all architectures (I will eventually get around fixing
> hppa).
Attaching a patch which enables Java support on all architectures.
Thanks,
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaub...@debian.org
`. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
diff -Nru old/simgrid-3.25+dfsg/debian/control new/simgrid-3.25+dfsg/debian/control
--- old/simgrid-3.25+dfsg/debian/control 2020-02-21 20:31:20.000000000 +0100
+++ new/simgrid-3.25+dfsg/debian/control 2020-03-08 23:35:44.819782490 +0100
@@ -7,14 +7,14 @@
dh-python,
cmake,
chrpath,
- default-jdk (>= 2:1.7~) [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x],
+ default-jdk (>= 2:1.7~),
# valgrind is missing on armel
valgrind [amd64 arm64 armhf i386 mips64el mipsel ppc64el s390x],
gfortran,
liblua5.3-dev, lua5.3,
# Disabled for now: libboost-context-dev. Seems broken on amd64
libboost-dev,
- libns3-dev [amd64 arm64 armel armhf i386 mips64el ppc64el s390x],
+ libns3-dev,
# Needed to build the doc
# doxygen,
# python3-breathe,
@@ -69,7 +69,7 @@
Package: libsimgrid-java
Section: java
-Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x
+Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libsimgrid3.25 (>= ${source:Version})
#Recommends: simgrid-doc (>= ${source:Version})
Breaks: simgrid (<< 3.11), simgrid-java
diff -Nru old/simgrid-3.25+dfsg/debian/rules new/simgrid-3.25+dfsg/debian/rules
--- old/simgrid-3.25+dfsg/debian/rules 2020-02-21 20:31:20.000000000 +0100
+++ new/simgrid-3.25+dfsg/debian/rules 2020-03-08 23:38:00.895783078 +0100
@@ -21,12 +21,6 @@
CFLAGS += -O3
endif
-ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x))
- CMAKE_FLAGS += -Denable_java=ON
-else
- CMAKE_FLAGS += -Denable_java=OFF
-endif
-
ifneq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
CMAKE_FLAGS += -Denable_documentation=off
endif
@@ -50,6 +44,7 @@
-Denable_msg=ON \
-Denable_smpi_MPICH3_testsuite=ON \
-Denable_lib_in_jar=OFF \
+ -Denable_java=ON \
${CMAKE_FLAGS}
override_dh_auto_build:
