summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-01-23 12:10:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-24 20:09:00 (GMT)
commitfcdc8d7f6d10b3abf9f6a28cff55b1cc89b88bc9 (patch)
tree61c0c97b459479dfec8e4fe4ce2c4eb4216608a0
parente90fad58faf9e25479158359c528999b09be1a02 (diff)
downloadpoky-fcdc8d7f6d10b3abf9f6a28cff55b1cc89b88bc9.tar.gz
libzypp: remove
This was only needed by zypper, which has itself been removed. (From OE-Core rev: 5c8169bd1c114aab76001a38ee4dd68d00d825e0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch71
-rw-r--r--meta/recipes-extended/libzypp/libzypp/close.patch32
-rw-r--r--meta/recipes-extended/libzypp/libzypp/config-release.patch23
-rw-r--r--meta/recipes-extended/libzypp/libzypp/cstdio.patch49
-rw-r--r--meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch22
-rw-r--r--meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch22
-rw-r--r--meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch54
-rw-r--r--meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch500
-rw-r--r--meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch32
-rw-r--r--meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch24
-rw-r--r--meta/recipes-extended/libzypp/libzypp/no-doc.patch33
-rw-r--r--meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch27
-rw-r--r--meta/recipes-extended/libzypp/libzypp/rpm5.patch32
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb160
14 files changed, 0 insertions, 1081 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch b/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch
deleted file mode 100644
index bfdb29b..0000000
--- a/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1Upstream-Status: Pending
2
3Workaround a problem with the C++ global constructors on ARM.
4
5As documented in the Yocto Bugzilla bug 938, the global constructors
6that define DEF_BUILTIN [const IdString _foo ( "foo" );] are not running
7before the usage of _foo during the initialization of the compatibility
8table.
9
10The patch, along with a similar change to the recipe generation of the
11oe-arch.h file, remove the DEF_BUILTIN globals and replace them with
12immediate strings wherever they are used.
13
14Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15
16Index: git/zypp/Arch.cc
17===================================================================
18--- git.orig/zypp/Arch.cc 2011-08-04 21:03:31.000000000 -0700
19+++ git/zypp/Arch.cc 2011-08-04 21:04:16.635480895 -0700
20@@ -152,13 +152,10 @@
21 // NOTE: Thake care CompatBits::IntT is able to provide one
22 // bit for each architecture.
23 //
24-#define DEF_BUILTIN(A) const IdString _##A( #A );
25- DEF_BUILTIN( all );
26- DEF_BUILTIN( any );
27- DEF_BUILTIN( noarch );
28+/* Global constructors are not working properly on ARM, avoid the
29+ * known bad case and merge constructors in with the usages
30+ */
31
32-#include "oe-arch.h"
33-#undef DEF_BUILTIN
34
35 ///////////////////////////////////////////////////////////////////
36 //
37@@ -227,9 +224,9 @@
38 // _noarch must have _idBit 0.
39 // Other builtins have 1-bit set
40 // and are initialized done on the fly.
41- _compatSet.insert( Arch::CompatEntry( _all, 0 ) );
42- _compatSet.insert( Arch::CompatEntry( _any, 0 ) );
43- _compatSet.insert( Arch::CompatEntry( _noarch, 0 ) );
44+ _compatSet.insert( Arch::CompatEntry( IdString ( "all" ), 0 ) );
45+ _compatSet.insert( Arch::CompatEntry( IdString ( "any" ), 0 ) );
46+ _compatSet.insert( Arch::CompatEntry( IdString ( "noarch" ), 0 ) );
47 ///////////////////////////////////////////////////////////////////
48 // Define the CompatibleWith relation:
49 //
50@@ -331,9 +328,9 @@
51 ///////////////////////////////////////////////////////////////////
52
53 const Arch Arch_empty ( IdString::Empty );
54- const Arch Arch_all( _all );
55- const Arch Arch_any( _any );
56- const Arch Arch_noarch( _noarch );
57+ const Arch Arch_all( IdString ( "all" ) );
58+ const Arch Arch_any( IdString ( "any" ) );
59+ const Arch Arch_noarch( IdString ( "noarch" ) );
60
61 #define OE_PROTO 1
62 #include "oe-arch.h"
63@@ -345,7 +342,7 @@
64 // METHOD TYPE : Ctor
65 //
66 Arch::Arch()
67- : _entry( &ArchCompatSet::instance().assertDef( _noarch ) )
68+ : _entry( &ArchCompatSet::instance().assertDef( IdString ( "noarch" ) ) )
69 {}
70
71 Arch::Arch( IdString::IdType id_r )
diff --git a/meta/recipes-extended/libzypp/libzypp/close.patch b/meta/recipes-extended/libzypp/libzypp/close.patch
deleted file mode 100644
index 0ff1825..0000000
--- a/meta/recipes-extended/libzypp/libzypp/close.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1close() is used without a protype therefore we include unistd.h
2Fixes compile errors like below
3
4/home/kraj/work/openembedded-core/build/tmp-eglibc/work/qemuppc-oe-linux/libzypp-0.0-git1+15b6c52260bbc52b3d8e585e271b67e10cc7c433-r18/git/zypp/ExternalProgram.h:239:47: error: '::close' has not been declared
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9Index: git/zypp/ExternalProgram.h
10===================================================================
11--- git.orig/zypp/ExternalProgram.h 2012-03-23 08:27:31.716438539 -0700
12+++ git/zypp/ExternalProgram.h 2012-03-23 08:27:54.520439367 -0700
13@@ -16,6 +16,7 @@
14 #include <map>
15 #include <string>
16 #include <vector>
17+#include <unistd.h>
18
19 #include "zypp/base/ExternalDataSource.h"
20 #include "zypp/Pathname.h"
21Index: git/zypp/base/Random.cc
22===================================================================
23--- git.orig/zypp/base/Random.cc 2012-03-23 08:31:09.732449118 -0700
24+++ git/zypp/base/Random.cc 2012-03-23 08:31:36.240450324 -0700
25@@ -3,6 +3,7 @@
26 #include <cstdio>
27 #include <iostream>
28 #include <fcntl.h>
29+#include <unistd.h>
30 #include "zypp/base/Random.h"
31
32 using namespace std;
diff --git a/meta/recipes-extended/libzypp/libzypp/config-release.patch b/meta/recipes-extended/libzypp/libzypp/config-release.patch
deleted file mode 100644
index 26c7307..0000000
--- a/meta/recipes-extended/libzypp/libzypp/config-release.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Upstream-Status: Inappropriate [distribution]
2
3Configure distro version package
4
5We need to configure a package that the system can use to determine the
6system distribution version.
7
8Hack: for now set to packagegroup-core-rpm.
9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11
12diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
13--- git.orig/zypp/ZConfig.cc 2011-03-14 16:30:07.492786134 -0500
14+++ git/zypp/ZConfig.cc 2011-03-15 11:39:15.396801927 -0500
15@@ -821,7 +821,7 @@
16 ///////////////////////////////////////////////////////////////////
17
18 std::string ZConfig::distroverpkg() const
19- { return "redhat-release"; }
20+ { return "packagegroup-core-rpm"; }
21
22 ///////////////////////////////////////////////////////////////////
23
diff --git a/meta/recipes-extended/libzypp/libzypp/cstdio.patch b/meta/recipes-extended/libzypp/libzypp/cstdio.patch
deleted file mode 100644
index a021d58..0000000
--- a/meta/recipes-extended/libzypp/libzypp/cstdio.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1include cstdio to get definitions of ::xxx functions which
2are now reported by gcc-4.7 as wanrings and warnings are treated
3as errors
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Upstream-Status: Pending
7
8Index: git/zypp/ExternalProgram.cc
9===================================================================
10--- git.orig/zypp/ExternalProgram.cc 2012-06-01 16:25:17.098304709 -0700
11+++ git/zypp/ExternalProgram.cc 2012-06-01 16:25:37.254305681 -0700
12@@ -22,6 +22,7 @@
13 #include <cstring> // strsignal
14 #include <iostream>
15 #include <sstream>
16+#include <cstdio>
17
18 #include "zypp/base/Logger.h"
19 #include "zypp/base/String.h"
20Index: git/zypp/PluginScript.cc
21===================================================================
22--- git.orig/zypp/PluginScript.cc 2012-06-01 16:21:37.814294089 -0700
23+++ git/zypp/PluginScript.cc 2012-06-01 16:24:41.002302961 -0700
24@@ -14,6 +14,7 @@
25
26 #include <iostream>
27 #include <sstream>
28+#include <cstdio>
29
30 #include "zypp/base/LogTools.h"
31 #include "zypp/base/DefaultIntegral.h"
32@@ -336,7 +337,7 @@
33 if ( fd == -1 )
34 ZYPP_THROW( PluginScriptException( "Bad file descriptor" ) );
35
36- ::clearerr( filep );
37+ std::clearerr( filep );
38 std::string data;
39 {
40 PluginDebugBuffer _debug( data ); // dump receive buffer if PLUGIN_DEBUG
41@@ -370,7 +371,7 @@
42 int retval = select( fd+1, &rfds, NULL, NULL, &tv );
43 if ( retval > 0 ) // FD_ISSET( fd, &rfds ) will be true.
44 {
45- ::clearerr( filep );
46+ std::clearerr( filep );
47 }
48 else if ( retval == 0 )
49 {
diff --git a/meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch b/meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch
deleted file mode 100644
index 0f17b48..0000000
--- a/meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Pending
2
3Fix following compilation errors with gcc 4.6.0
4Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/09
5
6| i586-poky-linux-g++: error: unrecognized option '--as-needed'
7| make[2]: *** [zypp/libzypp.so.810.1.0] Error 1
8
9
10Index: git/zypp/CMakeLists.txt
11===================================================================
12--- git.orig/zypp/CMakeLists.txt
13+++ git/zypp/CMakeLists.txt
14@@ -903,7 +903,7 @@ SET_LOGGROUP( "satsolver" ${zypp_sat_SRC
15 ADD_LIBRARY(zypp SHARED ${zypp_lib_SRCS})
16 SET_TARGET_PROPERTIES( zypp PROPERTIES VERSION "${LIBZYPP_VERSION_INFO}" )
17 SET_TARGET_PROPERTIES( zypp PROPERTIES SOVERSION "${LIBZYPP_SOVERSION_INFO}" )
18-SET_TARGET_PROPERTIES( zypp PROPERTIES LINK_FLAGS "--as-needed" )
19+SET_TARGET_PROPERTIES( zypp PROPERTIES LINK_FLAGS "-Wl,--as-needed" )
20 ADD_DEPENDENCIES(zypp schema_header)
21 # System libraries
22 SET(UTIL_LIBRARY util)
diff --git a/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch b/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch
deleted file mode 100644
index c11f5c5..0000000
--- a/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1tools/CMakeLists.txt: replace the hardcode "lib"
2
3replace the hardcode "lib" with LIB_INSTALL_DIR
4this will work with non /usr/lib libdir case
5
6Upstream-Status: Pending
7
8Signed-off-by: Yu Ke <ke.yu@intel.com>
9
10Index: libzypp/tools/CMakeLists.txt
11===================================================================
12--- libzypp.orig/tools/CMakeLists.txt
13+++ libzypp/tools/CMakeLists.txt
14@@ -1,7 +1,7 @@
15
16 ADD_SUBDIRECTORY( package-manager )
17
18-INSTALL( FILES notify-message DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/zypp" )
19+INSTALL( FILES notify-message DESTINATION "${LIB_INSTALL_DIR}/zypp" )
20
21 ## ############################################################
22
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
deleted file mode 100644
index 8d24ab0..0000000
--- a/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1zypp/Arch.cc: Add room for additional architecture compatibilities
2
3Upstream-Status: Pending
4
5Increase the size of the compatibility table from 9 to 30. There are already
6existing checks within libzypp to ensure that we don't overflow the 64-bit
7architecture field, so nothing further was required.
8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10
11diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
12--- git.orig/zypp/Arch.cc 2011-08-02 16:40:37.696662889 -0500
13+++ git/zypp/Arch.cc 2011-08-04 11:24:18.051745246 -0500
14@@ -280,13 +280,39 @@
15 IdString arch6_r = IdString(),
16 IdString arch7_r = IdString(),
17 IdString arch8_r = IdString(),
18- IdString arch9_r = IdString() )
19+ IdString arch9_r = IdString(),
20+ IdString arch10_r = IdString(),
21+ IdString arch11_r = IdString(),
22+ IdString arch12_r = IdString(),
23+ IdString arch13_r = IdString(),
24+ IdString arch14_r = IdString(),
25+ IdString arch15_r = IdString(),
26+ IdString arch16_r = IdString(),
27+ IdString arch17_r = IdString(),
28+ IdString arch18_r = IdString(),
29+ IdString arch19_r = IdString(),
30+ IdString arch20_r = IdString(),
31+ IdString arch21_r = IdString(),
32+ IdString arch22_r = IdString(),
33+ IdString arch23_r = IdString(),
34+ IdString arch24_r = IdString(),
35+ IdString arch25_r = IdString(),
36+ IdString arch26_r = IdString(),
37+ IdString arch27_r = IdString(),
38+ IdString arch28_r = IdString(),
39+ IdString arch29_r = IdString(),
40+ IdString arch30_r = IdString() )
41 {
42 const CompatEntry & target( assertCompatSetEntry( targetArch_r ) );
43 target.addCompatBit( assertCompatSetEntry( arch0_r )._idBit );
44 #define _SETARG(N) if ( arch##N##_r.empty() ) return; target.addCompatBit( assertCompatSetEntry( arch##N##_r )._idBit )
45 _SETARG(1); _SETARG(2); _SETARG(3); _SETARG(4);
46 _SETARG(5); _SETARG(6); _SETARG(7); _SETARG(8); _SETARG(9);
47+ _SETARG(10); _SETARG(11); _SETARG(12); _SETARG(13); _SETARG(14);
48+ _SETARG(15); _SETARG(16); _SETARG(17); _SETARG(18); _SETARG(19);
49+ _SETARG(20); _SETARG(21); _SETARG(22); _SETARG(23); _SETARG(24);
50+ _SETARG(25); _SETARG(26); _SETARG(27); _SETARG(28); _SETARG(29);
51+ _SETARG(30);
52 #undef _SETARG
53 }
54
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch
deleted file mode 100644
index 9a0e42b..0000000
--- a/meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch
+++ /dev/null
@@ -1,500 +0,0 @@
1Upstream-Status: Inappropriate [distribution]
2
3Disable all of the internal architectures
4
5We disable all of the internal architectures and replace them with ones
6generated by the libzypp recipe as specified in the oe-arch.h.
7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9
10diff -ur git.orig/tests/lib/TestSetup.h git/tests/lib/TestSetup.h
11--- git.orig/tests/lib/TestSetup.h 2011-03-28 14:24:36.534800770 -0500
12+++ git/tests/lib/TestSetup.h 2011-03-28 14:25:04.969912234 -0500
13@@ -66,7 +66,7 @@
14 * // enabls loging fot the scope of this block:
15 * // base::LogControl::TmpLineWriter shutUp( new log::FileLineWriter( "/tmp/YLOG" ) );
16 *
17- * TestSetup test( Arch_x86_64 );
18+ * TestSetup test( Arch_machine );
19 * // test.loadTarget(); // initialize and load target
20 * test.loadRepo( TESTS_SRC_DIR"/data/openSUSE-11.1" );
21 *
22@@ -313,7 +313,7 @@
23 * a TestSetup system or a real system. The provided repostitories are
24 * loaded into the pool (without refresh).
25 */
26- static void LoadSystemAt( const Pathname & sysRoot, const Arch & _testSetupArch_r = Arch_x86_64 )
27+ static void LoadSystemAt( const Pathname & sysRoot, const Arch & _testSetupArch_r = Arch_machine )
28 {
29 if ( ! PathInfo( sysRoot ).isDir() )
30 ZYPP_THROW( Exception("sysRoot argument needs to be a directory") );
31diff -ur git.orig/tools/DumpSelectable.cc git/tools/DumpSelectable.cc
32--- git.orig/tools/DumpSelectable.cc 2011-03-28 14:24:36.547876951 -0500
33+++ git/tools/DumpSelectable.cc 2011-03-28 14:25:04.969912234 -0500
34@@ -78,7 +78,7 @@
35 else if ( TestSetup::isTestSetup( sysRoot ) )
36 {
37 message << str::form( "*** Load TestSetup from '%s'", sysRoot.c_str() ) << endl;
38- TestSetup test( sysRoot, Arch_x86_64 );
39+ TestSetup test( sysRoot, Arch_machine );
40 test.loadRepos();
41 }
42 else
43diff -ur git.orig/tools/NameReqPrv.cc git/tools/NameReqPrv.cc
44--- git.orig/tools/NameReqPrv.cc 2011-03-28 14:24:36.547876951 -0500
45+++ git/tools/NameReqPrv.cc 2011-03-28 14:25:04.970849384 -0500
46@@ -112,7 +112,7 @@
47 else if ( TestSetup::isTestSetup( sysRoot ) )
48 {
49 message << str::form( "*** Load TestSetup from '%s'", sysRoot.c_str() ) << endl;
50- TestSetup test( sysRoot, Arch_x86_64 );
51+ TestSetup test( sysRoot, Arch_machine );
52 test.loadRepos();
53 dumpRange( message, satpool.reposBegin(), satpool.reposEnd() ) << endl;
54 }
55diff -ur git.orig/tools/ToolScanRepos.cc git/tools/ToolScanRepos.cc
56--- git.orig/tools/ToolScanRepos.cc 2011-03-28 14:24:36.547876951 -0500
57+++ git/tools/ToolScanRepos.cc 2011-03-28 14:25:04.970849384 -0500
58@@ -46,7 +46,7 @@
59 ///////////////////////////////////////////////////////////////////
60 Pathname mtmp( "/tmp" );
61 Pathname mroot( mtmp/appname );
62- Arch march( Arch_x86_64 );
63+ Arch march( Arch_machine );
64 bool oClearRoot = true;
65
66 std::vector<std::string> urls;
67@@ -83,7 +83,7 @@
68 if ( *(argv[0]) ) // empty
69 march = Arch( argv[0] );
70 else
71- march = Arch_x86_64;
72+ march = Arch_machine;
73 }
74 else
75 {
76@@ -131,4 +131,4 @@
77
78 INT << "===[END]============================================" << endl << endl;
79 return ret;
80-}
81\ No newline at end of file
82+}
83diff -ur git.orig/tools/zypp-list.cc git/tools/zypp-list.cc
84--- git.orig/tools/zypp-list.cc 2011-03-28 14:24:36.547876951 -0500
85+++ git/tools/zypp-list.cc 2011-03-28 14:25:04.971901224 -0500
86@@ -56,7 +56,7 @@
87 else if ( TestSetup::isTestSetup( sysRoot ) )
88 {
89 message << str::form( "*** Load TestSetup from '%s'", sysRoot.c_str() ) << endl;
90- TestSetup test( sysRoot, Arch_x86_64 );
91+ TestSetup test( sysRoot, Arch_machine );
92 test.loadRepos();
93 dumpRange( message, satpool.reposBegin(), satpool.reposEnd() ) << endl;
94 }
95diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
96--- git.orig/zypp/Arch.cc 2011-03-28 14:24:36.548877414 -0500
97+++ git/zypp/Arch.cc 2011-03-28 14:31:13.943786442 -0500
98@@ -153,53 +153,11 @@
99 // bit for each architecture.
100 //
101 #define DEF_BUILTIN(A) const IdString _##A( #A );
102+ DEF_BUILTIN( all );
103+ DEF_BUILTIN( any );
104 DEF_BUILTIN( noarch );
105
106- DEF_BUILTIN( i386 );
107- DEF_BUILTIN( i486 );
108- DEF_BUILTIN( i586 );
109- DEF_BUILTIN( i686 );
110- DEF_BUILTIN( athlon );
111- DEF_BUILTIN( x86_64 );
112-
113- DEF_BUILTIN( pentium3 );
114- DEF_BUILTIN( pentium4 );
115-
116- DEF_BUILTIN( s390 );
117- DEF_BUILTIN( s390x );
118-
119- DEF_BUILTIN( ppc );
120- DEF_BUILTIN( ppc64 );
121-
122- DEF_BUILTIN( ia64 );
123-
124- DEF_BUILTIN( alphaev67 );
125- DEF_BUILTIN( alphaev6 );
126- DEF_BUILTIN( alphapca56 );
127- DEF_BUILTIN( alphaev56 );
128- DEF_BUILTIN( alphaev5 );
129- DEF_BUILTIN( alpha );
130-
131- DEF_BUILTIN( sparc64v );
132- DEF_BUILTIN( sparcv9v );
133- DEF_BUILTIN( sparc64 );
134- DEF_BUILTIN( sparcv9 );
135- DEF_BUILTIN( sparcv8 );
136- DEF_BUILTIN( sparc );
137-
138- DEF_BUILTIN( armv7l );
139- DEF_BUILTIN( armv6l );
140- DEF_BUILTIN( armv5tejl );
141- DEF_BUILTIN( armv5tel );
142- DEF_BUILTIN( armv5l );
143- DEF_BUILTIN( armv4tl );
144- DEF_BUILTIN( armv4l );
145- DEF_BUILTIN( armv3l );
146-
147- DEF_BUILTIN( sh3 );
148-
149- DEF_BUILTIN( sh4 );
150- DEF_BUILTIN( sh4a );
151+#include "oe-arch.h"
152 #undef DEF_BUILTIN
153
154 ///////////////////////////////////////////////////////////////////
155@@ -269,6 +227,8 @@
156 // _noarch must have _idBit 0.
157 // Other builtins have 1-bit set
158 // and are initialized done on the fly.
159+ _compatSet.insert( Arch::CompatEntry( _all, 0 ) );
160+ _compatSet.insert( Arch::CompatEntry( _any, 0 ) );
161 _compatSet.insert( Arch::CompatEntry( _noarch, 0 ) );
162 ///////////////////////////////////////////////////////////////////
163 // Define the CompatibleWith relation:
164@@ -276,52 +236,9 @@
165 // NOTE: Order of definition is significant! (Arch::compare)
166 // - define compatible (less) architectures first!
167 //
168- defCompatibleWith( _i386, _noarch );
169- defCompatibleWith( _i486, _noarch,_i386 );
170- defCompatibleWith( _i586, _noarch,_i386,_i486 );
171- defCompatibleWith( _i686, _noarch,_i386,_i486,_i586 );
172- defCompatibleWith( _athlon, _noarch,_i386,_i486,_i586,_i686 );
173- defCompatibleWith( _x86_64, _noarch,_i386,_i486,_i586,_i686,_athlon );
174-
175- defCompatibleWith( _pentium3, _noarch,_i386,_i486,_i586,_i686 );
176- defCompatibleWith( _pentium4, _noarch,_i386,_i486,_i586,_i686,_pentium3 );
177-
178- defCompatibleWith( _ia64, _noarch,_i386,_i486,_i586,_i686 );
179- //
180- defCompatibleWith( _s390, _noarch );
181- defCompatibleWith( _s390x, _noarch,_s390 );
182- //
183- defCompatibleWith( _ppc, _noarch );
184- defCompatibleWith( _ppc64, _noarch,_ppc );
185- //
186- defCompatibleWith( _alpha, _noarch );
187- defCompatibleWith( _alphaev5, _noarch,_alpha );
188- defCompatibleWith( _alphaev56, _noarch,_alpha,_alphaev5 );
189- defCompatibleWith( _alphapca56, _noarch,_alpha,_alphaev5,_alphaev56 );
190- defCompatibleWith( _alphaev6, _noarch,_alpha,_alphaev5,_alphaev56,_alphapca56 );
191- defCompatibleWith( _alphaev67, _noarch,_alpha,_alphaev5,_alphaev56,_alphapca56,_alphaev6 );
192- //
193- defCompatibleWith( _sparc, _noarch );
194- defCompatibleWith( _sparcv8, _noarch,_sparc );
195- defCompatibleWith( _sparcv9, _noarch,_sparc,_sparcv8 );
196- defCompatibleWith( _sparcv9v, _noarch,_sparc,_sparcv8,_sparcv9 );
197- //
198- defCompatibleWith( _sparc64, _noarch,_sparc,_sparcv8,_sparcv9 );
199- defCompatibleWith( _sparc64v, _noarch,_sparc,_sparcv8,_sparcv9,_sparcv9v,_sparc64 );
200- //
201- defCompatibleWith( _armv3l, _noarch );
202- defCompatibleWith( _armv4l, _noarch,_armv3l );
203- defCompatibleWith( _armv4tl, _noarch,_armv3l,_armv4l );
204- defCompatibleWith( _armv5l, _noarch,_armv3l,_armv4l,_armv4tl );
205- defCompatibleWith( _armv5tel, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l );
206- defCompatibleWith( _armv5tejl, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel );
207- defCompatibleWith( _armv6l, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel,_armv5tejl );
208- defCompatibleWith( _armv7l, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel,_armv5tejl,_armv6l );
209- //
210- defCompatibleWith( _sh3, _noarch );
211- //
212- defCompatibleWith( _sh4, _noarch );
213- defCompatibleWith( _sh4a, _noarch,_sh4 );
214+#define OE_DEF_COMPAT 1
215+#include "oe-arch.h"
216+#undef OE_DEF_COMPAT
217 //
218 ///////////////////////////////////////////////////////////////////
219 // dumpOn( USR ) << endl;
220@@ -388,53 +305,13 @@
221 ///////////////////////////////////////////////////////////////////
222
223 const Arch Arch_empty ( IdString::Empty );
224+ const Arch Arch_all( _all );
225+ const Arch Arch_any( _any );
226 const Arch Arch_noarch( _noarch );
227
228- const Arch Arch_i386( _i386 );
229- const Arch Arch_i486( _i486 );
230- const Arch Arch_i586( _i586 );
231- const Arch Arch_i686( _i686 );
232- const Arch Arch_athlon( _athlon );
233- const Arch Arch_x86_64( _x86_64 );
234-
235- const Arch Arch_pentium3( _pentium3 );
236- const Arch Arch_pentium4( _pentium4 );
237-
238- const Arch Arch_s390( _s390 );
239- const Arch Arch_s390x( _s390x );
240-
241- const Arch Arch_ppc( _ppc );
242- const Arch Arch_ppc64( _ppc64 );
243-
244- const Arch Arch_ia64( _ia64 );
245-
246- const Arch Arch_alphaev67( _alphaev67 );
247- const Arch Arch_alphaev6( _alphaev6 );
248- const Arch Arch_alphapca56( _alphapca56 );
249- const Arch Arch_alphaev56( _alphaev56 );
250- const Arch Arch_alphaev5( _alphaev5 );
251- const Arch Arch_alpha( _alpha );
252-
253- const Arch Arch_sparc64v( _sparc64v );
254- const Arch Arch_sparc64( _sparc64 );
255- const Arch Arch_sparcv9v( _sparcv9v );
256- const Arch Arch_sparcv9( _sparcv9 );
257- const Arch Arch_sparcv8( _sparcv8 );
258- const Arch Arch_sparc( _sparc );
259-
260- const Arch Arch_armv7l( _armv7l );
261- const Arch Arch_armv6l( _armv6l );
262- const Arch Arch_armv5tejl( _armv5tejl );
263- const Arch Arch_armv5tel( _armv5tel );
264- const Arch Arch_armv5l( _armv5l );
265- const Arch Arch_armv4tl( _armv4tl );
266- const Arch Arch_armv4l( _armv4l );
267- const Arch Arch_armv3l( _armv3l );
268-
269- const Arch Arch_sh3( _sh3 );
270-
271- const Arch Arch_sh4( _sh4 );
272- const Arch Arch_sh4a( _sh4a );
273+#define OE_PROTO 1
274+#include "oe-arch.h"
275+#undef OE_PROTO
276
277 ///////////////////////////////////////////////////////////////////
278 //
279@@ -504,26 +381,10 @@
280 //
281 Arch Arch::baseArch( ) const
282 {
283- // check the multilib archs:
284- if (Arch_x86_64.compatibleWith(*this))
285- {
286- return Arch_x86_64;
287- }
288- if (Arch_sparc64v.compatibleWith(*this))
289- {
290- return Arch_sparc64v;
291- }
292- if (Arch_sparc64.compatibleWith(*this))
293- {
294- return Arch_sparc64;
295- }
296- if (Arch_ppc64.compatibleWith(*this))
297- {
298- return Arch_ppc64;
299- }
300- if (Arch_s390x.compatibleWith(*this))
301+ // Check the multilib arch:
302+ if (Arch_machine.compatibleWith(*this))
303 {
304- return Arch_s390x;
305+ return Arch_machine;
306 }
307 // Here: no multilib; return arch before noarch
308 CompatSet cset( compatSet( *this ) );
309diff -ur git.orig/zypp/Arch.h git/zypp/Arch.h
310--- git.orig/zypp/Arch.h 2011-03-28 14:24:36.548877414 -0500
311+++ git/zypp/Arch.h 2011-03-28 14:25:04.972801208 -0500
312@@ -162,89 +162,13 @@
313 extern const Arch Arch_empty;
314
315 /** \relates Arch */
316+ extern const Arch Arch_all;
317+ extern const Arch Arch_any;
318 extern const Arch Arch_noarch;
319
320- /** \relates Arch */
321- extern const Arch Arch_pentium4;
322- /** \relates Arch */
323- extern const Arch Arch_pentium3;
324-
325- /** \relates Arch */
326- extern const Arch Arch_x86_64;
327- /** \relates Arch */
328- extern const Arch Arch_athlon;
329- /** \relates Arch */
330- extern const Arch Arch_i686;
331- /** \relates Arch */
332- extern const Arch Arch_i586;
333- /** \relates Arch */
334- extern const Arch Arch_i486;
335- /** \relates Arch */
336- extern const Arch Arch_i386;
337-
338- /** \relates Arch */
339- extern const Arch Arch_s390x;
340- /** \relates Arch */
341- extern const Arch Arch_s390;
342-
343- /** \relates Arch */
344- extern const Arch Arch_ppc64;
345- /** \relates Arch */
346- extern const Arch Arch_ppc;
347-
348- /** \relates Arch */
349- extern const Arch Arch_ia64;
350-
351- /** \relates Arch */
352- extern const Arch Arch_alphaev67;
353- /** \relates Arch */
354- extern const Arch Arch_alphaev6;
355- /** \relates Arch */
356- extern const Arch Arch_alphapca56;
357- /** \relates Arch */
358- extern const Arch Arch_alphaev56;
359- /** \relates Arch */
360- extern const Arch Arch_alphaev5;
361- /** \relates Arch */
362- extern const Arch Arch_alpha;
363-
364- /** \relates Arch */
365- extern const Arch Arch_sparc64v;
366- /** \relates Arch */
367- extern const Arch Arch_sparc64;
368- /** \relates Arch */
369- extern const Arch Arch_sparcv9v;
370- /** \relates Arch */
371- extern const Arch Arch_sparcv9;
372- /** \relates Arch */
373- extern const Arch Arch_sparcv8;
374- /** \relates Arch */
375- extern const Arch Arch_sparc;
376-
377- /** \relates Arch */
378- extern const Arch Arch_armv7l;
379- /** \relates Arch */
380- extern const Arch Arch_armv6l;
381- /** \relates Arch */
382- extern const Arch Arch_armv5tejl;
383- /** \relates Arch */
384- extern const Arch Arch_armv5tel;
385- /** \relates Arch */
386- extern const Arch Arch_armv5l;
387- /** \relates Arch */
388- extern const Arch Arch_armv4tl;
389- /** \relates Arch */
390- extern const Arch Arch_armv4l;
391- /** \relates Arch */
392- extern const Arch Arch_armv3l;
393-
394- /** \relates Arch */
395- extern const Arch Arch_sh3;
396-
397- /** \relates Arch */
398- extern const Arch Arch_sh4;
399- /** \relates Arch */
400- extern const Arch Arch_sh4a;
401+#define OE_EXTERN_PROTO 1
402+#include "oe-arch.h"
403+#undef OE_EXTERN_PROTO
404 //@}
405
406 ///////////////////////////////////////////////////////////////////
407diff -ur git.orig/zypp/CMakeLists.txt git/zypp/CMakeLists.txt
408--- git.orig/zypp/CMakeLists.txt
409+++ git/zypp/CMakeLists.txt
410@@ -90,6 +90,7 @@ SET( zypp_EARLY_SRCS
411
412 SET( zypp_HEADERS
413 Arch.h
414+ oe-arch.h
415 AutoDispose.h
416 Bit.h
417 ByteCount.h
418diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
419--- git.orig/zypp/ZConfig.cc 2011-03-28 14:24:37.178989632 -0500
420+++ git/zypp/ZConfig.cc 2011-03-28 14:25:04.973971936 -0500
421@@ -48,77 +48,9 @@
422 */
423 Arch _autodetectSystemArchitecture()
424 {
425- struct ::utsname buf;
426- if ( ::uname( &buf ) < 0 )
427- {
428- ERR << "Can't determine system architecture" << endl;
429- return Arch_noarch;
430- }
431-
432- Arch architecture( buf.machine );
433- MIL << "Uname architecture is '" << buf.machine << "'" << endl;
434+ /* Define the default architecture, ignore uname! */
435+ Arch architecture( Arch_machine );
436
437- if ( architecture == Arch_i686 )
438- {
439- // some CPUs report i686 but dont implement cx8 and cmov
440- // check for both flags in /proc/cpuinfo and downgrade
441- // to i586 if either is missing (cf bug #18885)
442- std::ifstream cpuinfo( "/proc/cpuinfo" );
443- if ( cpuinfo )
444- {
445- for( iostr::EachLine in( cpuinfo ); in; in.next() )
446- {
447- if ( str::hasPrefix( *in, "flags" ) )
448- {
449- if ( in->find( "cx8" ) == std::string::npos
450- || in->find( "cmov" ) == std::string::npos )
451- {
452- architecture = Arch_i586;
453- WAR << "CPU lacks 'cx8' or 'cmov': architecture downgraded to '" << architecture << "'" << endl;
454- }
455- break;
456- }
457- }
458- }
459- else
460- {
461- ERR << "Cant open " << PathInfo("/proc/cpuinfo") << endl;
462- }
463- }
464- else if ( architecture == Arch_sparc || architecture == Arch_sparc64 )
465- {
466- // Check for sun4[vum] to get the real arch. (bug #566291)
467- std::ifstream cpuinfo( "/proc/cpuinfo" );
468- if ( cpuinfo )
469- {
470- for( iostr::EachLine in( cpuinfo ); in; in.next() )
471- {
472- if ( str::hasPrefix( *in, "type" ) )
473- {
474- if ( in->find( "sun4v" ) != std::string::npos )
475- {
476- architecture = ( architecture == Arch_sparc64 ? Arch_sparc64v : Arch_sparcv9v );
477- WAR << "CPU has 'sun4v': architecture upgraded to '" << architecture << "'" << endl;
478- }
479- else if ( in->find( "sun4u" ) != std::string::npos )
480- {
481- architecture = ( architecture == Arch_sparc64 ? Arch_sparc64 : Arch_sparcv9 );
482- WAR << "CPU has 'sun4u': architecture upgraded to '" << architecture << "'" << endl;
483- }
484- else if ( in->find( "sun4m" ) != std::string::npos )
485- {
486- architecture = Arch_sparcv8;
487- WAR << "CPU has 'sun4m': architecture upgraded to '" << architecture << "'" << endl;
488- }
489- break;
490- }
491- }
492- }
493- else
494- {
495- ERR << "Cant open " << PathInfo("/proc/cpuinfo") << endl;
496- }
497- }
498 return architecture;
499 }
500
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
deleted file mode 100644
index 7244284..0000000
--- a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1commit 6c47ad415246cc3a3edac2e1637106d330574c85
2Author: Mark Hatle <mark.hatle@windriver.com>
3Date: Fri May 11 19:05:09 2012 -0500
4
5 RpmHeader.cc: RPM 5.4.9 integration
6
7 _RPMVSF_xxx - NODIGEST, NOSIGNATURES, NOHEADER, and NOPAYLOAD
8 are now obsolete and no longer supported.
9
10 Upstream-Status: Inappropriate [other]
11 OE version is too old, when we uprev if this patch is still need it
12 should be sent upstream at that time.
13
14 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15
16diff --git a/zypp/target/rpm/RpmHeader.cc b/zypp/target/rpm/RpmHeader.cc
17index 1224ecd..c96dae6 100644
18--- a/zypp/target/rpm/RpmHeader.cc
19+++ b/zypp/target/rpm/RpmHeader.cc
20@@ -230,10 +230,12 @@ RpmHeader::constPtr RpmHeader::readPackage( const Pathname & path_r,
21 librpmDb::globalInit();
22 rpmts ts = ::rpmtsCreate();
23 unsigned vsflag = RPMVSF_DEFAULT;
24+#if !defined(_RPM_5)
25 if ( verification_r & NODIGEST )
26 vsflag |= _RPMVSF_NODIGESTS;
27 if ( verification_r & NOSIGNATURE )
28 vsflag |= _RPMVSF_NOSIGNATURES;
29+#endif
30 ::rpmtsSetVSFlags( ts, rpmVSFlags(vsflag) );
31
32 Header nh = 0;
diff --git a/meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch b/meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch
deleted file mode 100644
index d01ef70..0000000
--- a/meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Upstream-Status: Pending
2
3# with gcc 4.3.3 and MIPS target, gcc "internal compiler error: segmentation fault" error
4# occurs when compiling Applydeltarpm.cc. I didn't find the exact reason leading to this
5# error, but it should be related to how boost tribool type is interpreted by g++. So provide
6# this mips workaround for now. We'll come back later to check whether it's still required after
7# upgrading to 4.5.0.
8#
9# Signed-off-by Kevin Tian <kevin.tian@intel.com>, 2010-09-08
10
11diff --git a/zypp/repo/Applydeltarpm.cc b/zypp/repo/Applydeltarpm.cc
12index 7b382be..0d7a1f8 100644
13--- a/zypp/repo/Applydeltarpm.cc
14+++ b/zypp/repo/Applydeltarpm.cc
15@@ -77,7 +77,8 @@ namespace zypp
16 else
17 {
18 // _last is 'indeterminate' or '!have'
19- if ( (_last = have) )
20+ _last = have;
21+ if ( _last )
22 MIL << "Found executable " << prog << endl;
23 else
24 WAR << "No executable " << prog << endl;
diff --git a/meta/recipes-extended/libzypp/libzypp/no-doc.patch b/meta/recipes-extended/libzypp/libzypp/no-doc.patch
deleted file mode 100644
index c7e6e92..0000000
--- a/meta/recipes-extended/libzypp/libzypp/no-doc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3not building doc (doxygen based)
4
58/19/2010 - created by Qing He <qing.he@intel.com>
6
7diff --git a/CMakeLists.txt b/CMakeLists.txt
8index 0629b1f..41746cc 100644
9--- a/CMakeLists.txt
10+++ b/CMakeLists.txt
11@@ -110,13 +110,6 @@ FIND_PACKAGE(EXPAT REQUIRED)
12 FIND_PACKAGE(OpenSSL REQUIRED)
13 FIND_PACKAGE(Udev REQUIRED)
14
15-FIND_PROGRAM( DOXYGEN doxygen )
16-IF ( NOT DOXYGEN )
17- MESSAGE( FATAL_ERROR "doxygen not found: install doxygen to build the documentation." )
18-ELSE ( NOT DOXYGEN )
19- MESSAGE( STATUS "doxygen found: ${DOXYGEN}" )
20-ENDIF ( NOT DOXYGEN )
21-
22 MESSAGE(STATUS "soname: ${LIBZYPP_VERSION_INFO}")
23 MESSAGE(STATUS "version: ${VERSION}")
24
25@@ -154,7 +147,7 @@ ADD_SUBDIRECTORY( devel EXCLUDE_FROM_ALL )
26 ADD_SUBDIRECTORY( tools )
27 ADD_SUBDIRECTORY( examples )
28 ADD_SUBDIRECTORY( po EXCLUDE_FROM_ALL )
29-ADD_SUBDIRECTORY( doc )
30+#ADD_SUBDIRECTORY( doc )
31 ADD_SUBDIRECTORY( vendor )
32 ADD_SUBDIRECTORY( tests EXCLUDE_FROM_ALL )
33
diff --git a/meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch b/meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch
deleted file mode 100644
index 7006203..0000000
--- a/meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Upstream-Status: Pending
2
3diff --git a/zypp/target/rpm/librpmDb.cc b/zypp/target/rpm/librpmDb.cc
4index 1689fbb..4999cd9 100644
5--- a/zypp/target/rpm/librpmDb.cc
6+++ b/zypp/target/rpm/librpmDb.cc
7@@ -60,20 +60,6 @@ public:
8 const char * root = ( _root == "/" ? NULL : _root.asString().c_str() );
9 int perms = 0644;
10
11- // check whether to create a new db
12- PathInfo master( _root + _dbPath + "Packages" );
13- if ( ! master.isFile() )
14- {
15- // init database
16- int res = ::rpmdbInit( root, perms );
17- if ( res )
18- {
19- ERR << "rpmdbInit error(" << res << "): " << *this << endl;
20- _error = shared_ptr<RpmInitException>(new RpmInitException(_root, _dbPath));
21- ZYPP_THROW(*_error);
22- }
23- }
24-
25 // open database
26 int res = ::rpmdbOpen( root, &_db, (readonly_r ? O_RDONLY : O_RDWR ), perms );
27 if ( res || !_db )
diff --git a/meta/recipes-extended/libzypp/libzypp/rpm5.patch b/meta/recipes-extended/libzypp/libzypp/rpm5.patch
deleted file mode 100644
index bf3da24..0000000
--- a/meta/recipes-extended/libzypp/libzypp/rpm5.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Pending
2
3build fix for rpm5
4
58/19/2010 - created by Qing He <qing.he@intel.com>
6
7diff --git a/zypp/target/rpm/BinHeader.cc b/zypp/target/rpm/BinHeader.cc
8index e9ad382..86a9c96 100644
9--- a/zypp/target/rpm/BinHeader.cc
10+++ b/zypp/target/rpm/BinHeader.cc
11@@ -19,7 +19,7 @@ extern "C"
12
13 #ifndef _RPM_4_4_COMPAT
14 #ifdef _RPM_5
15-typedef rpmuint32_t rpm_count_t;
16+typedef uint32_t rpm_count_t;
17 #else
18 typedef int32_t rpm_count_t;
19 #endif
20diff --git a/zypp/target/rpm/librpmDb.cv3.cc b/zypp/target/rpm/librpmDb.cv3.cc
21index bf18e45..5454ea9 100644
22--- a/zypp/target/rpm/librpmDb.cv3.cc
23+++ b/zypp/target/rpm/librpmDb.cv3.cc
24@@ -14,7 +14,7 @@ extern "C"
25 {
26 #ifndef _RPM_4_4_COMPAT
27 #ifdef _RPM_5
28-typedef rpmuint32_t rpm_count_t;
29+typedef uint32_t rpm_count_t;
30 #else
31 typedef int32_t rpm_count_t;
32 #endif
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
deleted file mode 100644
index 1729c78..0000000
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ /dev/null
@@ -1,160 +0,0 @@
1HOMEPAGE = "http://en.opensuse.org/Portal:Libzypp"
2DESCRIPTION = "The ZYpp Linux Software management framework"
3
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=11fccc94d26293d78cb4996cb17e5fa7"
6
7inherit cmake gettext
8
9DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev libproxy"
10
11S = "${WORKDIR}/git"
12SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
13PV = "0.0-git${SRCPV}"
14PR = "r23"
15
16SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
17 file://no-doc.patch \
18 file://rpm5.patch \
19 file://rpm5-no-rpmdbinit.patch \
20 file://config-release.patch \
21 file://libzypp-oearch.patch \
22 file://libzypp-compatargs.patch \
23 file://fix_for_compile_wth_gcc-4.6.0.patch \
24 file://hardcode-lib-fix.patch \
25 file://close.patch \
26 file://libzypp-rpm549.patch \
27 file://cstdio.patch \
28 "
29
30SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
31
32# ARM specific global constructor workaround
33SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch"
34
35# rpmdb2solv from sat-solver is run from libzypp
36RDEPENDS_${PN} = "sat-solver rpm-libs gzip ${RDEPGNUPG}"
37
38RDEPGNUPG = "gnupg"
39RDEPGNUPG_libc-uclibc = ""
40
41PACKAGES =+ "${PN}-pkgmgt"
42
43FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons"
44FILES_${PN}-dev += "${datadir}/cmake"
45
46FILES_${PN}-pkgmgt = "${bindir}/package-manager \
47 ${bindir}/package-manager-su \
48 ${datadir}/applications/package-manager.desktop \
49 "
50
51EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
52OECMAKE_CXX_LINK_FLAGS_libc-uclibc += "-pthread"
53
54LDFLAGS += "-lpthread"
55
56PACKAGE_ARCH = "${MACHINE_ARCH}"
57
58AVOID_CONSTRUCTOR = ""
59
60# Due to an ARM specific compiler issue
61AVOID_CONSTRUCTOR_arm = "true"
62
63# Due to a potential conflict with '_mips' being a define
64AVOID_CONSTRUCTOR_mips = "true"
65
66do_archgen () {
67 # We need to dynamically generate our arch file based on the machine
68 # configuration
69 echo "/* Automatically generated by the libzypp recipes */" > zypp/oe-arch.h
70 echo "/* Avoid Constructor: ${AVOID_CONSTRUCTOR} */" >> zypp/oe-arch.h
71 echo "" >> zypp/oe-arch.h
72 echo "#ifndef OE_ARCH_H" >> zypp/oe-arch.h
73 echo "#define OE_ARCH_H 1" >> zypp/oe-arch.h
74 echo "#define Arch_machine Arch_${MACHINE_ARCH}" | tr - _ >> zypp/oe-arch.h
75 echo "#endif /* OE_ARCH_H */" >> zypp/oe-arch.h
76 echo "" >> zypp/oe-arch.h
77 if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
78 echo "#ifdef DEF_BUILTIN" >> zypp/oe-arch.h
79 echo "/* Specify builtin types */" >> zypp/oe-arch.h
80 for each_arch in ${PACKAGE_ARCHS} ; do
81 case "$each_arch" in
82 all | any | noarch)
83 continue;;
84 esac
85 echo " DEF_BUILTIN( ${each_arch} );" | tr - _ >> zypp/oe-arch.h
86 done
87 echo "#endif /* DEF_BUILTIN */" >> zypp/oe-arch.h
88 echo "" >> zypp/oe-arch.h
89 fi
90 echo "#ifdef OE_EXTERN_PROTO" >> zypp/oe-arch.h
91 echo "/* Specify extern prototypes */" >> zypp/oe-arch.h
92 for each_arch in ${PACKAGE_ARCHS} ; do
93 case "$each_arch" in
94 all | any | noarch)
95 continue;;
96 esac
97 echo " extern const Arch Arch_${each_arch};" | tr - _ >> zypp/oe-arch.h
98 done
99 echo "#endif /* OE_EXTERN_PROTO */" >> zypp/oe-arch.h
100 echo "" >> zypp/oe-arch.h
101 echo "#ifdef OE_PROTO" >> zypp/oe-arch.h
102 echo "/* Specify prototypes */" >> zypp/oe-arch.h
103 for each_arch in ${PACKAGE_ARCHS} ; do
104 case "$each_arch" in
105 all | any | noarch)
106 continue;;
107 esac
108 if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
109 printf " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h
110 echo "(_${each_arch});" | tr - _ >> zypp/oe-arch.h
111 else
112 printf " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h
113 echo "( IdString ( \"${each_arch}\" ) );" | tr - _ >> zypp/oe-arch.h
114 fi
115 done
116 echo "#endif /* OE_PROTO */" >> zypp/oe-arch.h
117 echo "" >> zypp/oe-arch.h
118 echo "#ifdef OE_DEF_COMPAT" >> zypp/oe-arch.h
119 echo "/* Specify compatibility information */" >> zypp/oe-arch.h
120 INSTALL_PLATFORM_ARCHS=""
121 for each_arch in ${PACKAGE_ARCHS} ; do
122 INSTALL_PLATFORM_ARCHS="$each_arch $INSTALL_PLATFORM_ARCHS"
123 done
124
125 COMPAT_WITH=""
126 set -- ${INSTALL_PLATFORM_ARCHS}
127 while [ $# -gt 0 ]; do
128 case "$1" in
129 all | any | noarch)
130 shift ; continue;;
131 esac
132 if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
133 CARCH="_$1"
134 else
135 CARCH="IdString(\"$1\")"
136 fi
137 shift
138 COMPAT=""
139 for each_arch in "$@"; do
140 if [ -z "${AVOID_CONSTRUCTOR}" ]; then
141 arch_val="_${each_arch}"
142 else
143 arch_val="IdString(\"${each_arch}\")"
144 fi
145 if [ -z "$COMPAT" ]; then
146 COMPAT=${arch_val}
147 else
148 COMPAT="${arch_val},$COMPAT"
149 fi
150 done
151 COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH"
152 done
153 for each_compat in ${COMPAT_WITH} ; do
154 echo " defCompatibleWith( ${each_compat} );" | tr - _ >> zypp/oe-arch.h
155 done
156 echo "#endif /* DEF_COMPAT */" >> zypp/oe-arch.h
157 echo "" >> zypp/oe-arch.h
158}
159
160addtask archgen before do_configure after do_patch