Fix import error at mic 37/251837/1 accepted/tizen_6.5_unified accepted/tizen_7.0_unified accepted/tizen_7.0_unified_hotfix backup/libzypp-17.23.7-20220922 tizen_6.5 tizen_7.0 tizen_7.0_hotfix accepted/tizen/6.5/unified/20211029.014502 accepted/tizen/7.0/unified/20221110.055843 accepted/tizen/7.0/unified/hotfix/20221116.111101 accepted/tizen/unified/20210120.120804 submit/tizen/20210119.235717 submit/tizen_6.5/20211028.163501 tizen_6.5.m2_release tizen_7.0_m2_release
authorDongHun Kwak <dh0128.kwak@samsung.com>
Tue, 19 Jan 2021 23:52:14 +0000 (08:52 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Tue, 19 Jan 2021 23:52:14 +0000 (08:52 +0900)
  File "/usr/lib64/python2.7/importlib/__init__.py", line 37, in import_module
    __import__(name)
ImportError: /usr/lib64/python2.7/site-packages/_zypp.so: undefined symbol: _ZN4zypp5dumOnERSoRKNS_15OnMediaLocationE

Change-Id: Icab1dc49a7df8b5c2e78bd629e26f3447daf7a0f

packaging/fix_swig_syntax_error.patch

index d0e79e6..eca9f8f 100644 (file)
@@ -1,3 +1,18 @@
+diff --git a/zypp/OnMediaLocation.h b/zypp/OnMediaLocation.h
+index 264f6fadf..db16f72e3 100644
+--- a/zypp/OnMediaLocation.h
++++ b/zypp/OnMediaLocation.h
+@@ -125,8 +125,10 @@ namespace zypp
+   /** \relates OnMediaLocation Stream output */
+   std::ostream & operator<<( std::ostream & str, const OnMediaLocation & obj );
+
++#ifndef SWIG // Swig treats it as syntax error
+   /** \relates OnMediaLocation Verbose stream output */
+   std::ostream & dumOn( std::ostream & str, const OnMediaLocation & obj );
++#endif
+
+ } // namespace zypp
+ ///////////////////////////////////////////////////////////////////
 diff --git a/zypp/Patch.h b/zypp/Patch.h
 index 33de43c82..1ba453a8a 100644
 --- a/zypp/Patch.h
@@ -49,6 +64,6 @@ index 88b1844f6..b3adf33a9 100644
 +#ifndef SWIG // Swig treats it as syntax error
        EstablishedStates establishedStates() const;
 +#endif
+
        /** Map holding pseudo installed items where current and established status differ. */
        typedef EstablishedStates::ChangedPseudoInstalled ChangedPseudoInstalled;