[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1025682: marked as done (mujoco: please fix symbols file and riscv64 build [PATCH])

Your message dated Wed, 14 Dec 2022 16:21:43 +0000
with message-id <E1p5UVr-008kOJ-1u@fasolo.debian.org>
and subject line Bug#1025682: fixed in mujoco 2.2.2-3
has caused the Debian Bug report #1025682,
regarding mujoco: please fix symbols file and riscv64 build [PATCH]
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1025682: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1025682
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: mujoco
Version: 2.2.2-2
tags: patch


Hello, this is how I fixed the build in Ubuntu, by adding -latomic to fix a link failure on riscv64 (and others), and forwarded patch upstream, and by making some symbols disappearing with different gcc optimization level, lto enabled, or newer gcc.

diff -Nru mujoco-2.2.2/debian/changelog mujoco-2.2.2/debian/changelog
--- mujoco-2.2.2/debian/changelog	2022-10-08 00:31:52.000000000 +0200
+++ mujoco-2.2.2/debian/changelog	2022-12-07 08:25:37.000000000 +0100
@@ -1,3 +1,10 @@
+mujoco (2.2.2-3) unstable; urgency=medium
+
+  * Fix build on riscv64 by linking latomic.
+  * Fixup symbols file.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 07 Dec 2022 08:25:37 +0100
+
 mujoco (2.2.2-2) unstable; urgency=medium
* Only track symbols for amd64 architecture. 
diff -Nru mujoco-2.2.2/debian/libmujoco2.2.2.symbols.amd64 mujoco-2.2.2/debian/libmujoco2.2.2.symbols.amd64
--- mujoco-2.2.2/debian/libmujoco2.2.2.symbols.amd64	2022-10-02 18:21:42.000000000 +0200
+++ mujoco-2.2.2/debian/libmujoco2.2.2.symbols.amd64	2022-12-07 08:25:37.000000000 +0100
@@ -1,4 +1,4 @@
-libmujoco.so.2.2.2 libmujoco2.2.2 #MINVER#
+nlibmujoco.so.2.2.2 libmujoco2.2.2 #MINVER#
 * Build-Depends-Package: libmujoco-dev
  (optional)_ZNKSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_iESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE4findERS7_@Base 2.2.0
  (optional)_ZNSt6vectorI7mjtObj_SaIS0_EE17_M_realloc_insertIJRKS0_EEEvN9__gnu_cxx17__normal_iteratorIPS0_S2_EEDpOT_@Base 2.2.0
@@ -10,7 +10,7 @@
  (optional)_ZNSt6vectorIS_IfSaIfEESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.2.0
  (optional)_ZNSt6vectorIS_IiSaIiEESaIS1_EE17_M_default_appendEm@Base 2.2.0
  (optional)_ZNSt6vectorIS_IiSaIiEESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.2.0
- _ZNSt6vectorISt4pairIiiESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.2.2
+ (optional)_ZNSt6vectorISt4pairIiiESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.2.2
  (optional)_ZNSt6vectorIdSaIdEE17_M_default_appendEm@Base 2.2.0
  (optional)_ZNSt6vectorIdSaIdEE17_M_realloc_insertIJRKdEEEvN9__gnu_cxx17__normal_iteratorIPdS1_EEDpOT_@Base 2.2.0
  (optional)_ZNSt6vectorIfSaIfEE17_M_default_appendEm@Base 2.2.0
@@ -22,10 +22,10 @@
  (optional)_ZNSt6vectorIiSaIiEE17_M_realloc_insertIJRKiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base 2.2.0
  (optional)_ZNSt6vectorIiSaIiEE17_M_realloc_insertIJiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base 2.2.0
  (optional)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 2.2.0
- _ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIJS6_IS5_S5_EEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_@Base 2.2.2
- _ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.2.2
- _ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.2.2
- _ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_iESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIJS6_IS5_iEEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_@Base 2.2.2
+ (optional)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIJS6_IS5_S5_EEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_@Base 2.2.2
+ (optional)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.2.2
+ (optional)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.2.2
+ (optional)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_iESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIJS6_IS5_iEEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_@Base 2.2.2
  (optional)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_iESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.2.0
  (optional)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_iESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.2.0
  (optional)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_iESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE4findERS7_@Base 2.2.0
@@ -33,7 +33,7 @@
  (optional)_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_@Base 2.2.0
  _ZTI13mj_XMLPrinter@Base 2.2.0
  _ZTS13mj_XMLPrinter@Base 2.2.0
- _ZTV13mj_XMLPrinter@Base 2.2.0
+ (optional)_ZTV13mj_XMLPrinter@Base 2.2.0
  _mjPRIVATE__get_tls_error_fn@Base 2.2.0
  _mjPRIVATE__get_tls_warning_fn@Base 2.2.0
  _mjPRIVATE__get_xml_precision@Base 2.2.0
diff -Nru mujoco-2.2.2/debian/patches/add-atomic.patch mujoco-2.2.2/debian/patches/add-atomic.patch
--- mujoco-2.2.2/debian/patches/add-atomic.patch	1970-01-01 01:00:00.000000000 +0100
+++ mujoco-2.2.2/debian/patches/add-atomic.patch	2022-12-07 08:25:37.000000000 +0100
@@ -0,0 +1,14 @@
+Description: Link with atomic, to fix FTBFS on riscv64
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Last-Update: 2022-12-07
+Forwarded: https://github.com/deepmind/mujoco/pull/632
+--- mujoco-2.2.2.orig/simulate/CMakeLists.txt
++++ mujoco-2.2.2/simulate/CMakeLists.txt
+@@ -151,6 +151,7 @@ target_link_libraries(
+   glfw
+   Threads::Threads
+   lodepng
++  atomic
+ )
+
+ target_link_options(simulate PRIVATE ${MUJOCO_SIMULATE_LINK_OPTIONS})
diff -Nru mujoco-2.2.2/debian/patches/series mujoco-2.2.2/debian/patches/series
--- mujoco-2.2.2/debian/patches/series	2022-10-02 17:54:52.000000000 +0200
+++ mujoco-2.2.2/debian/patches/series	2022-12-07 08:24:20.000000000 +0100
@@ -1 +1,2 @@
 cmake.patch
+add-atomic.patch

Attachment: OpenPGP_signature
Description: OpenPGP digital signature


--- End Message ---
--- Begin Message --- 
Source: mujoco
Source-Version: 2.2.2-3
Done: Mo Zhou <lumin@debian.org>

We believe that the bug you reported is fixed in the latest version of
mujoco, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1025682@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Mo Zhou <lumin@debian.org> (supplier of updated mujoco package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Wed, 14 Dec 2022 11:09:03 -0500
Source: mujoco
Architecture: source
Version: 2.2.2-3
Distribution: unstable
Urgency: medium
Maintainer: Debian Deep Learning Team <debian-ai@lists.debian.org>
Changed-By: Mo Zhou <lumin@debian.org>
Closes: 1022065 1025682
Changes:
 mujoco (2.2.2-3) unstable; urgency=medium
 .
   * Fix symbols and riscv64 build (Closes: #1022065, #1025682)
Checksums-Sha1:
 a8338b586796338c56ddebbc3492dc5f02b567c6 2289 mujoco_2.2.2-3.dsc
 f385c50629781d081da9c19dd2f3cb438b693881 14036 mujoco_2.2.2-3.debian.tar.xz
 cdfd034514201f3ba4bde3808ddbced9b8e5a971 7021 mujoco_2.2.2-3_source.buildinfo
Checksums-Sha256:
 96d787a6e95c485126aec5bdbd861299725c5e323c32ca24439a9d5af29666c5 2289 mujoco_2.2.2-3.dsc
 f61ceb86bd752a57d07b25e55736e00e6eeffc396160551a1515b6027f80fec6 14036 mujoco_2.2.2-3.debian.tar.xz
 a9f328d798884b3ff52fd1b3ded731014d7ec0b8ac40991311ce02ac17340baa 7021 mujoco_2.2.2-3_source.buildinfo
Files:
 e23c5585ca5fb76cd84f9b0fb5bb651f 2289 science optional mujoco_2.2.2-3.dsc
 c40267488314477eb6697a5e0ac25235 14036 science optional mujoco_2.2.2-3.debian.tar.xz
 a342ec7de4bee841b81abb14db0d8edc 7021 science optional mujoco_2.2.2-3_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQJFBAEBCgAvFiEEY4vHXsHlxYkGfjXeYmRes19oaooFAmOZ9T0RHGx1bWluQGRl
Ymlhbi5vcmcACgkQYmRes19oaop3Wg//VkD6MXfK8BxKkZbqDYX1PAPKnKY5yImY
zTVEYYuxfITs0BRSuzsW0GM0KhPbecn/5XNPx0lHklMTVRq68j9QkqgrhdzjK9Vb
cdEC3J7xuZjt1b6TSBbT5Yjm3tZGOP/M5IpyugMxUejdYdIlZHpObxz+IVssL04A
P5k4KRFPki1OcgasCkG9B3/bRmQ9z+1LpJ37nQzoHNWBDNbB8T2eQYMoFsnIViOP
h3haT4Un857KLDUBKAxvtAoJpEqWG+X4f1O8OpwGDXQTYYLJNq60vVFOMox7wGJL
VtCwfX89wfCKJOBfBK7pgmeNOEM/r7+gjd6ZzWAAWb6Z80VoIrepRvBN1WtLoyyq
eejlouf21pDDej1q2t6kn+CyRIv+WzPeef6Eeh1IE6UKZ/rgWncrp1wA1RbPpQVu
eGBuoPfawP0bqsNYiLFJTbdPmEwcyncXp1qAyObADAQHWT1reoSFngy+rvQLMGM6
bCrMEZxafIxFfxrDVFsMqpBDv74JT68G3nWMC+PWU2DVXNrJ69XPpXo6ic+BzoIP
KCdCsp1bdfiB8mDAJz5/D3k8fl5YAoo2aSchWsDbqJ2rDca6uAVECn3hqF1xU/e7
fEKdFTwHHClDSHFOj1R8dvVKQcNQnnFCLKtKDctJVhjnSCbRNO0PMBwe+rMHJslJ
FsCLK/wJRUY=
=dvrE
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: