summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/sat-solver
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/sat-solver')
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch57
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/cmake.patch31
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/db5.patch26
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch115
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/futimes.patch32
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch127
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch22
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/sat-solver_rpm5.patch69
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver_git.bb67
9 files changed, 0 insertions, 546 deletions
diff --git a/meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch b/meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch
deleted file mode 100644
index 402d16ec56..0000000000
--- a/meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From bbbb4fb9b7c85fde90608710dff09480696c6567 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 9 Feb 2012 16:01:56 -0800
4Subject: [PATCH] sat_xfopen.c: Forward port to zlib 1.2.6 gzFile
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9---
10 ext/sat_xfopen.c | 10 +++++-----
11 1 files changed, 5 insertions(+), 5 deletions(-)
12
13diff --git a/ext/sat_xfopen.c b/ext/sat_xfopen.c
14index cf943cf..b3d458d 100644
15--- a/ext/sat_xfopen.c
16+++ b/ext/sat_xfopen.c
17@@ -16,16 +16,16 @@
18
19 static ssize_t cookie_gzread(void *cookie, char *buf, size_t nbytes)
20 {
21- return gzread((gzFile *)cookie, buf, nbytes);
22+ return gzread((gzFile)cookie, buf, nbytes);
23 }
24
25 static int
26 cookie_gzclose(void *cookie)
27 {
28- return gzclose((gzFile *)cookie);
29+ return gzclose((gzFile)cookie);
30 }
31
32-static FILE *mygzfopen(gzFile* gzf)
33+static FILE *mygzfopen(gzFile gzf)
34 {
35 #ifdef HAVE_FUNOPEN
36 return funopen(
37@@ -49,7 +49,7 @@ FILE *
38 sat_xfopen(const char *fn, const char *mode)
39 {
40 char *suf;
41- gzFile *gzf;
42+ gzFile gzf;
43
44 if (!fn)
45 return 0;
46@@ -68,7 +68,7 @@ FILE *
47 sat_xfopen_fd(const char *fn, int fd, const char *mode)
48 {
49 char *suf;
50- gzFile *gzf;
51+ gzFile gzf;
52
53 suf = fn ? strrchr(fn, '.') : 0;
54 if (!mode)
55--
561.7.5.4
57
diff --git a/meta/recipes-extended/sat-solver/sat-solver/cmake.patch b/meta/recipes-extended/sat-solver/sat-solver/cmake.patch
deleted file mode 100644
index c1ec86ad68..0000000000
--- a/meta/recipes-extended/sat-solver/sat-solver/cmake.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Enable debugging for all builds
4not building docs (need oxygen)
5
68/19/2010 - created by Qing He <qing.he@intel.com>
71/24/2011 - Disable Fedora/Debian checking/settings by Mark Hatle <mark.hatle@windriver.com>
83/15/2011 - Updated to newer version of sat-solver by Mark Hatle <mark.hatle@windriver.com>
93/16/2011 - Split original patch and simplify by Mark Hatle <mark.hatle@windriver.com>
10
11diff -ur git.orig2/CMakeLists.txt git/CMakeLists.txt
12--- git.orig2/CMakeLists.txt 2011-03-16 16:29:43.532032285 -0500
13+++ git/CMakeLists.txt 2011-03-16 16:32:59.982034501 -0500
14@@ -177,7 +177,7 @@
15
16 MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}")
17
18-set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall" )
19+set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -g" )
20 set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -g -O3" )
21 set ( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g3 -O0" )
22
23@@ -186,7 +186,7 @@
24 ADD_SUBDIRECTORY(tools)
25 ADD_SUBDIRECTORY(tests)
26 ADD_SUBDIRECTORY(examples)
27-ADD_SUBDIRECTORY(doc)
28+#ADD_SUBDIRECTORY(doc)
29
30 MESSAGE(STATUS "version: ${VERSION}")
31
diff --git a/meta/recipes-extended/sat-solver/sat-solver/db5.patch b/meta/recipes-extended/sat-solver/sat-solver/db5.patch
deleted file mode 100644
index 6b679126db..0000000000
--- a/meta/recipes-extended/sat-solver/sat-solver/db5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Upstream-Status: Pending
2
3RPM no longer includes an internal version of db, it now relies on the system
4version. The system version in Poky is available at /usr/include/db51
5
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
7
8rebased to sat-solver commit 9e1f2a097965debebc69cebf8ed73c6ff31a5220
9
10Signed-off-by: Qing He <qing.he@intel.com>
11
12--- git/ext/repo_rpmdb.c.orig 2011-01-06 10:46:37.369900542 -0600
13+++ git/ext/repo_rpmdb.c 2011-01-06 10:48:35.482919434 -0600
14@@ -29,11 +29,7 @@
15 #include <rpm/rpmdb.h>
16
17 #ifndef DB_CREATE
18-# ifdef FEDORA
19-# include <db.h>
20-# else
21-# include <rpm/db.h>
22-# endif
23+# include <db.h>
24 #endif
25
26 #include "pool.h"
diff --git a/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch b/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch
deleted file mode 100644
index 0a55069093..0000000000
--- a/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch
+++ /dev/null
@@ -1,115 +0,0 @@
1Upstream-Status: Pending
2
3Fix the following compilation issues with gcc 4.6.0
4
5| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c: In function 'startElement':
6| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:278:25: error: variable 'status' set but not used [-Werror=unused-but-set-variable]
7| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:386:36: error: variable 'src' set but not used [-Werror=unused-but-set-variable]
8| cc1: all warnings being treated as errors
9|
10| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_updateinfoxml.o] Error 1
11| make[2]: *** Waiting for unfinished jobs....
12| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c: In function 'transaction_add_obsoleted':
13| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c:1933:21: error: variable 'oldcount' set but not used [-Werror=unused-but-set-variable]
14| cc1: all warnings being treated as errors
15|
16| make[2]: *** [src/CMakeFiles/satsolver.dir/transaction.o] Error 1
17| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
18| make[1]: *** [src/CMakeFiles/satsolver.dir/all] Error 2
19| make[1]: *** Waiting for unfinished jobs....
20| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'rpm_byfp':
21| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2406:20: error: variable 'headerend' set but not used [-Werror=unused-but-set-variable]
22| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'parsekeydata':
23| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2833:29: error: variable 'scr' set but not used [-Werror=unused-but-set-variable]
24| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2669:7: error: variable 'useridl' set but not used [-Werror=unused-but-set-variable]
25| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2667:7: error: variable 'pubkeyl' set but not used [-Werror=unused-but-set-variable]
26| cc1: all warnings being treated as errors
27|
28| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_rpmdb.o] Error 1
29| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
30| make[1]: *** [ext/CMakeFiles/satsolverext.dir/all] Error 2
31| make[1]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
32| make: *** [all] Error 2
33| FATAL: oe_runmake failed
34| ERROR: Function 'do_compile' failed (see /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/temp/log.do_compile.21830 for further information)
35NOTE: package sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9: task do_compile: Failed
36
37Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/05
38
39Index: git/src/transaction.c
40===================================================================
41--- git.orig/src/transaction.c
42+++ git/src/transaction.c
43@@ -1930,7 +1930,7 @@ transaction_add_obsoleted(Transaction *t
44 Repo *installed = pool->installed;
45 Id p;
46 Solvable *s;
47- int i, j, k, max, oldcount;
48+ int i, j, k, max;
49 Map done;
50 Queue obsq, *steps;
51
52@@ -1945,7 +1945,6 @@ transaction_add_obsoleted(Transaction *t
53 return;
54 /* make room */
55 steps = &trans->steps;
56- oldcount = steps->count;
57 queue_insertn(steps, 0, max);
58
59 /* now add em */
60Index: git/ext/repo_updateinfoxml.c
61===================================================================
62--- git.orig/ext/repo_updateinfoxml.c
63+++ git/ext/repo_updateinfoxml.c
64@@ -275,7 +275,7 @@ startElement(void *userData, const char
65 */
66 case STATE_UPDATE:
67 {
68- const char *from = 0, *status = 0, *type = 0, *version = 0;
69+ const char *from = 0, __attribute__((__unused__)) *status = 0, *type = 0, *version = 0;
70 for (; *atts; atts += 2)
71 {
72 if (!strcmp(*atts, "from"))
73@@ -383,7 +383,7 @@ startElement(void *userData, const char
74 */
75 case STATE_PACKAGE:
76 {
77- const char *arch = 0, *name = 0, *src = 0;
78+ const char *arch = 0, *name = 0, __attribute__((__unused__)) *src = 0;
79 Id evr = makeevr_atts(pool, pd, atts); /* parse "epoch", "version", "release" */
80 Id n, a = 0;
81 Id rel_id;
82Index: git/ext/repo_rpmdb.c
83===================================================================
84--- git.orig/ext/repo_rpmdb.c
85+++ git/ext/repo_rpmdb.c
86@@ -2403,7 +2403,7 @@ void *
87 rpm_byfp(FILE *fp, const char *name, void **statep)
88 {
89 struct rpm_by_state *state = *statep;
90- int headerstart, headerend;
91+ int headerstart, __attribute__((__unused__))headerend;
92 RpmHead *rpmhead;
93 int sigdsize, sigcnt, l;
94 unsigned char lead[4096];
95@@ -2664,9 +2664,9 @@ parsekeydata(Solvable *s, Repodata *data
96 unsigned char keyid[8];
97 unsigned int kcr = 0, maxex = 0;
98 unsigned char *pubkey = 0;
99- int pubkeyl = 0;
100+ int __attribute__((__unused__)) pubkeyl = 0;
101 unsigned char *userid = 0;
102- int useridl = 0;
103+ int __attribute__((__unused__)) useridl = 0;
104
105 for (; pl; p += l, pl -= l)
106 {
107@@ -2830,7 +2830,7 @@ parsekeydata(Solvable *s, Repodata *data
108 {
109 int j, ql, haveissuer;
110 unsigned char *q;
111- unsigned int ex = 0, scr = 0;
112+ unsigned int ex = 0, __attribute__((__unused__))scr = 0;
113 unsigned char issuer[8];
114
115 // printf("V4 signature packet\n");
diff --git a/meta/recipes-extended/sat-solver/sat-solver/futimes.patch b/meta/recipes-extended/sat-solver/sat-solver/futimes.patch
deleted file mode 100644
index b24d852ae7..0000000000
--- a/meta/recipes-extended/sat-solver/sat-solver/futimes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1This patch uses utimes instead of futimes for uclibc
2since futimes is not available
3
4Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: git/examples/solv.c
8===================================================================
9--- git.orig/examples/solv.c 2012-06-01 12:06:22.041552848 -0700
10+++ git/examples/solv.c 2012-06-01 12:49:17.417677449 -0700
11@@ -1027,7 +1027,8 @@
12 int flags;
13
14 cinfo = repo->appdata;
15- if (!(fp = fopen(calccachepath(repo, repoext), "r")))
16+ const char* fname = calccachepath(repo, repoext);
17+ if (!(fp = fopen(fname, "r")))
18 return 0;
19 if (fseek(fp, -sizeof(mycookie), SEEK_END) || fread(mycookie, sizeof(mycookie), 1, fp) != 1)
20 {
21@@ -1068,7 +1069,11 @@
22 memcpy(cinfo->extcookie, myextcookie, sizeof(myextcookie));
23 }
24 if (mark)
25+#ifdef __UCLIBC__
26+ utimes(fname, 0); /* try to set modification time */
27+#else
28 futimes(fileno(fp), 0); /* try to set modification time */
29+#endif
30 fclose(fp);
31 return 1;
32 }
diff --git a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch
deleted file mode 100644
index 11bf5b0182..0000000000
--- a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch
+++ /dev/null
@@ -1,127 +0,0 @@
1Upstream-Status: Inappropriate [distribution]
2
3Fix "arch" integration with Poky.
4
5Add a missing "any" architecture type and update the semantics to use it.
6
7Disable the built-in archpolicies structure, and replace it with one
8we generate in the recipe.
9
10Also add poky semantics option in CMake.
11
12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
13Signed-off-by: Qing He <qing.he@intel.com>
14
15diff --git a/CMakeLists.txt b/CMakeLists.txt
16index 443281e..4456a87 100644
17--- a/CMakeLists.txt
18+++ b/CMakeLists.txt
19@@ -45,6 +45,11 @@ MESSAGE(STATUS "Building for Debian")
20 ADD_DEFINITIONS( -DDEBIAN -DDEBIAN_SEMANTICS)
21 ENDIF ( DEBIAN )
22
23+IF ( OE_CORE )
24+MESSAGE(STATUS "Building for OE core")
25+ADD_DEFINITIONS( -DOE_CORE -DOE_CORE_SEMANTICS)
26+ENDIF ( OE_CORE )
27+
28 IF ( MULTI_SEMANTICS )
29 MESSAGE(STATUS "Enabling multi dist support")
30 ADD_DEFINITIONS( -DMULTI_SEMANTICS)
31diff --git a/src/knownid.h b/src/knownid.h
32index 7757ae0..4b8bee7 100644
33--- a/src/knownid.h
34+++ b/src/knownid.h
35@@ -57,6 +57,7 @@ KNOWNID(SYSTEM_SYSTEM, "system:system"),
36 KNOWNID(ARCH_SRC, "src"),
37 KNOWNID(ARCH_NOSRC, "nosrc"),
38 KNOWNID(ARCH_NOARCH, "noarch"),
39+KNOWNID(ARCH_ANY, "any"),
40 KNOWNID(ARCH_ALL, "all"),
41
42 KNOWNID(REPOSITORY_SOLVABLES, "repository:solvables"),
43diff --git a/src/policy.c b/src/policy.c
44index 55c8677..3356ff8 100644
45--- a/src/policy.c
46+++ b/src/policy.c
47@@ -486,6 +486,13 @@ policy_illegal_archchange(Solver *solv, Solvable *s1, Solvable *s2)
48 }
49
50 /* we allow changes to/from noarch */
51+#ifdef OE_CORE_SEMANTICS
52+ if (a1 == a2 ||
53+ a1 == ARCH_NOARCH || a2 == ARCH_NOARCH ||
54+ a1 == ARCH_ANY || a2 == ARCH_ANY ||
55+ a1 == ARCH_ALL || a2 == ARCH_ALL)
56+ return 0;
57+#else
58 #ifndef DEBIAN_SEMANTICS
59 if (a1 == a2 || a1 == ARCH_NOARCH || a2 == ARCH_NOARCH)
60 return 0;
61@@ -493,6 +500,7 @@ policy_illegal_archchange(Solver *solv, Solvable *s1, Solvable *s2)
62 if (a1 == a2 || a1 == ARCH_ALL || a2 == ARCH_ALL)
63 return 0;
64 #endif
65+#endif
66 if (!pool->id2arch)
67 return 0;
68 a1 = a1 <= pool->lastarch ? pool->id2arch[a1] : 0;
69diff --git a/src/poolarch.c b/src/poolarch.c
70index 34a14a3..2d7cd70 100644
71--- a/src/poolarch.c
72+++ b/src/poolarch.c
73@@ -20,38 +20,8 @@
74 #include "poolarch.h"
75 #include "util.h"
76
77-const char *archpolicies[] = {
78- "x86_64", "x86_64:i686:i586:i486:i386",
79- "i686", "i686:i586:i486:i386",
80- "i586", "i586:i486:i386",
81- "i486", "i486:i386",
82- "i386", "i386",
83- "s390x", "s390x:s390",
84- "s390", "s390",
85- "ia64", "ia64:i686:i586:i486:i386",
86- "ppc64", "ppc64:ppc",
87- "ppc", "ppc",
88- "armv7nhl", "armv7nhl:armv7hl",
89- "armv7hl", "armv7hl",
90- "armv7l", "armv7l:armv6l:armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l",
91- "armv6l", "armv6l:armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l",
92- "armv5tejl", "armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l",
93- "armv5tel", "armv5tel:armv5l:armv4tl:armv4l:armv3l",
94- "armv5l", "armv5l:armv4tl:armv4l:armv3l",
95- "armv4tl", "armv4tl:armv4l:armv3l",
96- "armv4l", "armv4l:armv3l",
97- "armv3l", "armv3l",
98- "sh3", "sh3",
99- "sh4", "sh4",
100- "sh4a", "sh4a:sh4",
101- "sparc64v", "sparc64v:sparc64:sparcv9v:sparcv9:sparcv8:sparc",
102- "sparc64", "sparc64:sparcv9:sparcv8:sparc",
103- "sparcv9v", "sparcv9v:sparcv9:sparcv8:sparc",
104- "sparcv9", "sparcv9:sparcv8:sparc",
105- "sparcv8", "sparcv8:sparc",
106- "sparc", "sparc",
107- 0
108-};
109+/* Provide the const char *archpolicies structure */
110+#include "core-arch.h"
111
112 void
113 pool_setarch(Pool *pool, const char *arch)
114@@ -71,10 +41,10 @@ pool_setarch(Pool *pool, const char *arch)
115 pool->lastarch = 0;
116 return;
117 }
118-#ifndef DEBIAN_SEMANTICS
119- id = ARCH_NOARCH;
120-#else
121+#if defined(DEBIAN_SEMANTICS) || defined(OE_CORE_SEMANTICS)
122 id = ARCH_ALL;
123+#else
124+ id = ARCH_NOARCH;
125 #endif
126 lastarch = id + 255;
127 id2arch = sat_calloc(lastarch + 1, sizeof(Id));
diff --git a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch
deleted file mode 100644
index 60483e951f..0000000000
--- a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Pending
2
3Fix obsolete settings with RPM5.
4
5The following patch is from Michael Schroeder <mls@suse.de>
6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8
9diff -ur git.orig/src/pool.c git/src/pool.c
10--- git.orig/src/pool.c 2011-03-25 15:49:34.885834194 -0500
11+++ git/src/pool.c 2011-03-28 10:55:13.138786524 -0500
12@@ -70,6 +70,10 @@
13 pool->disttype = DISTTYPE_DEB;
14 # endif
15 #endif
16+#ifdef RPM5
17+ pool->obsoleteusesprovides = 1;
18+ pool->implicitobsoleteusesprovides = 1;
19+#endif
20 return pool;
21 }
22
diff --git a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_rpm5.patch b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_rpm5.patch
deleted file mode 100644
index d59c5136ea..0000000000
--- a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_rpm5.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1Upstream-Status: Pending
2
3Add RPM5 configuration support
4
5Update the cmake configuration to detect additional files needed by RPM5.
6
7Original work by Qing He <qing.he@intel.com>.
8
9Merged and updated to make this more likely to be accepted upstream.
10
11Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
12
13diff -ur git.orig/CMakeLists.txt git/CMakeLists.txt
14--- git.orig/CMakeLists.txt 2011-03-16 16:16:29.152786178 -0500
15+++ git/CMakeLists.txt 2011-03-16 16:29:43.532032285 -0500
16@@ -50,7 +50,16 @@
17 ADD_DEFINITIONS( -DMULTI_SEMANTICS)
18 ENDIF ( MULTI_SEMANTICS )
19
20-IF ( NOT DEBIAN )
21+if ( RPM5 )
22+MESSAGE(STATUS "Enabling RPM 5 support")
23+ADD_DEFINITIONS( -DRPM5)
24+
25+FIND_PACKAGE(PkgConfig REQUIRED)
26+PKG_CHECK_MODULES(RPM REQUIRED rpm)
27+INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} )
28+ENDIF ( RPM5 )
29+
30+IF ( RPM5 OR NOT DEBIAN )
31 FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb)
32 IF ( NOT RPMDB_LIBRARY )
33 FIND_LIBRARY(RPMDB_LIBRARY NAMES rpm)
34@@ -59,13 +68,17 @@
35 IF ( RPMIO_LIBRARY )
36 SET( RPMDB_LIBRARY ${RPMIO_LIBRARY} ${RPMDB_LIBRARY} )
37 ENDIF ( RPMIO_LIBRARY )
38-IF ( FEDORA )
39+FIND_LIBRARY(RPMMISC_LIBRARY NAMES rpmmisc)
40+IF ( RPMMISC_LIBRARY )
41+SET ( RPMDB_LIBRARY ${RPMMISC_LIBRARY} ${RPMDB_LIBRARY} )
42+ENDIF ( RPMMISC_LIBRARY )
43+IF ( RPM5 OR FEDORA )
44 FIND_LIBRARY(DB_LIBRARY NAMES db)
45 IF ( DB_LIBRARY )
46 SET( RPMDB_LIBRARY ${DB_LIBRARY} ${RPMDB_LIBRARY} )
47 ENDIF ( DB_LIBRARY )
48-ENDIF ( FEDORA )
49-ENDIF ( NOT DEBIAN )
50+ENDIF ( RPM5 OR FEDORA )
51+ENDIF ( RPM5 OR NOT DEBIAN )
52
53 INCLUDE ( CheckFunctionExists )
54 INCLUDE ( TestBigEndian )
55diff -ur git.orig/ext/repo_rpmdb.c git/ext/repo_rpmdb.c
56--- git.orig/ext/repo_rpmdb.c 2011-03-16 18:03:55.401907738 -0500
57+++ git/ext/repo_rpmdb.c 2011-03-16 18:04:47.472989651 -0500
58@@ -3039,7 +3039,11 @@
59 repodata_set_str(data, s - s->repo->pool->solvables, PUBKEY_KEYID, keyid);
60 if (dig->pubkey.userid)
61 setutf8string(data, s - s->repo->pool->solvables, SOLVABLE_SUMMARY, dig->pubkey.userid);
62+#ifndef RPM5
63 (void)pgpFreeDig(dig);
64+#else
65+ (void)pgpDigFree(dig);
66+#endif
67 sat_free((void *)pkts);
68 return 1;
69 }
diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
deleted file mode 100644
index 67503b7278..0000000000
--- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
+++ /dev/null
@@ -1,67 +0,0 @@
1DESCRIPTION = "Sat Solver"
2HOMEPAGE = "http://http://en.opensuse.org/openSUSE:Libzypp_satsolver"
3
4LICENSE = "BSD"
5LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
6
7DEPENDS = "libcheck rpm zlib expat db"
8
9SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32"
10PV = "0.0-git${SRCPV}"
11PR = "r14"
12
13PARALLEL_MAKE=""
14
15SRC_URI = "git://github.com/openSUSE/sat-solver.git;protocol=git \
16 file://sat-solver_rpm5.patch \
17 file://sat-solver_obsolete.patch \
18 file://cmake.patch \
19 file://db5.patch \
20 file://sat-solver_core.patch \
21 file://fix_gcc-4.6.0_compile_issue.patch \
22 file://0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch \
23 file://futimes.patch \
24 "
25
26S = "${WORKDIR}/git"
27
28EXTRA_OECMAKE += "-DRPM5=RPM5 -DOE_CORE=OE_CORE"
29
30EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
31
32TUNE_CCARGS_append_libc-uclibc = " -DUSE_OWN_QSORT=1 "
33
34inherit cmake pkgconfig
35
36RDEPENDS_${PN} = "rpm-libs"
37
38PACKAGE_ARCH = "${MACHINE_ARCH}"
39
40do_archgen () {
41 # We need to dynamically generate our arch file based on the machine
42 # configuration
43
44 INSTALL_PLATFORM_ARCHS=""
45 for each_arch in ${PACKAGE_ARCHS} ; do
46 case "$each_arch" in
47 all | any | noarch)
48 continue;;
49 esac
50 INSTALL_PLATFORM_ARCHS="`echo $each_arch | sed 's/-/_/g'` $INSTALL_PLATFORM_ARCHS"
51 done
52
53 echo "/* Automatically generated by the sat-solver recipe */" > src/core-arch.h
54 echo "const char *archpolicies[] = {" >> src/core-arch.h
55
56 set -- $INSTALL_PLATFORM_ARCHS
57
58 save_IFS=$IFS
59 IFS=:
60 while [ $# -gt 0 ]; do echo " \"$1\", "\""$*"\", >> src/core-arch.h ; shift; done
61 IFS=$save_IFS
62
63 echo " 0" >> src/core-arch.h
64 echo "};" >> src/core-arch.h
65}
66
67addtask archgen before do_configure after do_patch
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 00:07:36 +0000