diff options
Diffstat (limited to 'meta/recipes-devtools/libdnf/libdnf')
8 files changed, 114 insertions, 114 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch deleted file mode 100644 index 384add5e12..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From 7d60d62b5c5374156703ca7262fb2f85ec5db119 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 6 Nov 2018 13:54:43 +0100 | ||
4 | Subject: [PATCH] Add WITH_TESTS option | ||
5 | |||
6 | This makes a dependency on cppunit optional. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | |||
11 | --- | ||
12 | CMakeLists.txt | 3 +++ | ||
13 | python/hawkey/CMakeLists.txt | 2 ++ | ||
14 | 2 files changed, 5 insertions(+) | ||
15 | |||
16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
17 | index 9c6e1b2f..8599c540 100644 | ||
18 | --- a/CMakeLists.txt | ||
19 | +++ b/CMakeLists.txt | ||
20 | @@ -33,6 +33,7 @@ option(WITH_MAN "Enables hawkey man page generation" ON) | ||
21 | option(WITH_ZCHUNK "Build with zchunk support" ON) | ||
22 | option(ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF) | ||
23 | option(ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF) | ||
24 | +option(WITH_TESTS "Enables unit tests" ON) | ||
25 | |||
26 | |||
27 | # build options - debugging | ||
28 | @@ -179,8 +180,10 @@ endif() | ||
29 | |||
30 | |||
31 | # build tests | ||
32 | +IF (WITH_TESTS) | ||
33 | enable_testing() | ||
34 | add_subdirectory(tests) | ||
35 | +ENDIF() | ||
36 | if(WITH_BINDINGS) | ||
37 | add_subdirectory(python/hawkey) | ||
38 | endif() | ||
39 | diff --git a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt | ||
40 | index d9645346..84d17204 100644 | ||
41 | --- a/python/hawkey/CMakeLists.txt | ||
42 | +++ b/python/hawkey/CMakeLists.txt | ||
43 | @@ -50,4 +50,6 @@ target_link_libraries(_hawkeymodule ${PYTHON_LIBRARY}) | ||
44 | install(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey) | ||
45 | install(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey) | ||
46 | |||
47 | +IF (WITH_TESTS) | ||
48 | add_subdirectory(tests) | ||
49 | +ENDIF() | ||
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch index 791a32e748..046e09eab2 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9bb7630915c3e787732463a3e2064fe0e177101b Mon Sep 17 00:00:00 2001 | 1 | From 5d6db56791d326e6b486dca54fe2335af0225229 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 24 Nov 2016 14:33:07 +0200 | 3 | Date: Thu, 24 Nov 2016 14:33:07 +0200 |
4 | Subject: [PATCH 1/4] FindGtkDoc.cmake: drop the requirement for | 4 | Subject: [PATCH] FindGtkDoc.cmake: drop the requirement for |
5 | GTKDOC_SCANGOBJ_WRAPPER | 5 | GTKDOC_SCANGOBJ_WRAPPER |
6 | 6 | ||
7 | For some reason cmake is not able to find it when building in openembedded, | 7 | For some reason cmake is not able to find it when building in openembedded, |
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/cmake/modules/FindGtkDoc.cmake b/cmake/modules/FindGtkDoc.cmake | 16 | diff --git a/cmake/modules/FindGtkDoc.cmake b/cmake/modules/FindGtkDoc.cmake |
17 | index 92b2cc7..39f34bd 100644 | 17 | index 92b2cc7e..39f34bd5 100644 |
18 | --- a/cmake/modules/FindGtkDoc.cmake | 18 | --- a/cmake/modules/FindGtkDoc.cmake |
19 | +++ b/cmake/modules/FindGtkDoc.cmake | 19 | +++ b/cmake/modules/FindGtkDoc.cmake |
20 | @@ -52,7 +52,7 @@ find_program(GTKDOC_MKHTML_EXE gtkdoc-mkhtml PATH "${GLIB_PREFIX}/bin") | 20 | @@ -52,7 +52,7 @@ find_program(GTKDOC_MKHTML_EXE gtkdoc-mkhtml PATH "${GLIB_PREFIX}/bin") |
@@ -26,6 +26,3 @@ index 92b2cc7..39f34bd 100644 | |||
26 | VERSION_VAR GtkDoc_VERSION) | 26 | VERSION_VAR GtkDoc_VERSION) |
27 | 27 | ||
28 | # :: | 28 | # :: |
29 | -- | ||
30 | 2.11.0 | ||
31 | |||
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch index 10450defbe..223c1be218 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9294cd19e5e3121fb8d37b44ee82dd7c4b3ab2c7 Mon Sep 17 00:00:00 2001 | 1 | From bf9bde4af952b67cc357d25b9863889099ea9665 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 7 Feb 2017 12:16:03 +0200 | 3 | Date: Tue, 7 Feb 2017 12:16:03 +0200 |
4 | Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is | 4 | Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is |
@@ -7,21 +7,20 @@ Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is | |||
7 | 7 | ||
8 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] | 8 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] |
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | |||
11 | --- | 10 | --- |
12 | CMakeLists.txt | 2 +- | 11 | CMakeLists.txt | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 13 | ||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 14 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
16 | index b722d4fb..ce88b9e3 100644 | 15 | index e99b28d0..548a9137 100644 |
17 | --- a/CMakeLists.txt | 16 | --- a/CMakeLists.txt |
18 | +++ b/CMakeLists.txt | 17 | +++ b/CMakeLists.txt |
19 | @@ -45,7 +45,7 @@ endif() | 18 | @@ -51,7 +51,7 @@ endif() |
19 | |||
20 | 20 | ||
21 | # build dependencies | 21 | # build dependencies |
22 | find_package(Gpgme REQUIRED) | ||
23 | -PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) | 22 | -PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) |
24 | +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) | 23 | +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) |
25 | set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) | 24 | set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) |
26 | find_package(OpenSSL REQUIRED) | 25 | |
27 | 26 | ||
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch deleted file mode 100644 index 6dd7c71aae..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From b570c7f8bd089deec7da2b108aa789a27025a473 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 19 Nov 2019 13:46:09 +0100 | ||
4 | Subject: [PATCH] Look fo sphinx only if documentation is actually enabled | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | docs/hawkey/CMakeLists.txt | 20 +++++++++++--------- | ||
10 | 1 file changed, 11 insertions(+), 9 deletions(-) | ||
11 | |||
12 | diff --git a/docs/hawkey/CMakeLists.txt b/docs/hawkey/CMakeLists.txt | ||
13 | index 52cc35c6..63c7672f 100644 | ||
14 | --- a/docs/hawkey/CMakeLists.txt | ||
15 | +++ b/docs/hawkey/CMakeLists.txt | ||
16 | @@ -2,15 +2,17 @@ | ||
17 | # tell sphinx-build to do them both in one go: | ||
18 | |||
19 | |||
20 | -find_program(SPHINX_PROGRAM NAMES "sphinx-build-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") | ||
21 | -if(NOT EXISTS ${SPHINX_PROGRAM}) | ||
22 | - find_program(SPHINX_PROGRAM NAMES sphinx-build-${PYTHON_VERSION_MAJOR}) | ||
23 | -endif() | ||
24 | -if(NOT EXISTS ${SPHINX_PROGRAM}) | ||
25 | - find_program(SPHINX_PROGRAM NAMES sphinx-build) | ||
26 | -endif() | ||
27 | -if(NOT EXISTS ${SPHINX_PROGRAM}) | ||
28 | - message(FATAL_ERROR "Sphinx program not found." ) | ||
29 | +if (WITH_HTML OR WITH_MAN) | ||
30 | + find_program(SPHINX_PROGRAM NAMES "sphinx-build-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") | ||
31 | + if(NOT EXISTS ${SPHINX_PROGRAM}) | ||
32 | + find_program(SPHINX_PROGRAM NAMES sphinx-build-${PYTHON_VERSION_MAJOR}) | ||
33 | + endif() | ||
34 | + if(NOT EXISTS ${SPHINX_PROGRAM}) | ||
35 | + find_program(SPHINX_PROGRAM NAMES sphinx-build) | ||
36 | + endif() | ||
37 | + if(NOT EXISTS ${SPHINX_PROGRAM}) | ||
38 | + message(FATAL_ERROR "Sphinx program not found." ) | ||
39 | + endif() | ||
40 | endif() | ||
41 | |||
42 | if(WITH_HTML) | ||
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch new file mode 100644 index 0000000000..27f76077d7 --- /dev/null +++ b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From a6b3bc4fb3db996cd6c5616a99c16d085704dae0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 1 Jun 2021 10:23:59 +0800 | ||
4 | Subject: [PATCH] drop FindPythonInstDir.cmake | ||
5 | |||
6 | Since commit [1] applied, PYTHON_INSTALL_DIR is not right | ||
7 | on nativesdk build | ||
8 | ... | ||
9 | |Building for python3 | ||
10 | |-- Python install dir is | ||
11 | |tmp-glibc/work/x86_64-nativesdk-wrlinuxsdk-linux/nativesdk-libdnf/0.63.0-r0/ | ||
12 | recipe-sysroot-native/usr/lib/python3.9/site-packages | ||
13 | ... | ||
14 | |||
15 | Yocto manually set PYTHON_INSTALL_DIR from recipe, it is not | ||
16 | necessary to call FindPythonInstDir.cmake which will override | ||
17 | Yocto setting | ||
18 | |||
19 | [1] https://github.com/rpm-software-management/libdnf/commit/f1cffbfb9f338da827e233c2d8ac3a25a6a59a69 | ||
20 | |||
21 | Upstream-Status: Inappropriate [Yocto specific] | ||
22 | |||
23 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
24 | --- | ||
25 | cmake/modules/FindPythonInstDir.cmake | 7 +------ | ||
26 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
27 | |||
28 | diff --git a/cmake/modules/FindPythonInstDir.cmake b/cmake/modules/FindPythonInstDir.cmake | ||
29 | index ed098ded..8b137891 100644 | ||
30 | --- a/cmake/modules/FindPythonInstDir.cmake | ||
31 | +++ b/cmake/modules/FindPythonInstDir.cmake | ||
32 | @@ -1,6 +1 @@ | ||
33 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " | ||
34 | -from sys import stdout | ||
35 | -from sysconfig import get_path | ||
36 | -path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'}) | ||
37 | -stdout.write(path)" | ||
38 | -OUTPUT_VARIABLE PYTHON_INSTALL_DIR) | ||
39 | + | ||
diff --git a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch index 475c8f120b..ecab47e5af 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 18c2c06017784cd641cc8a3deee5fc472008f7f4 Mon Sep 17 00:00:00 2001 | 1 | From e40def862bdeb10da295b15c5904fe2829d391c7 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 30 Dec 2016 18:24:50 +0200 | 3 | Date: Fri, 30 Dec 2016 18:24:50 +0200 |
4 | Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module | 4 | Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module |
@@ -7,22 +7,21 @@ Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module | |||
7 | 7 | ||
8 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] | 8 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] |
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | |||
11 | --- | 10 | --- |
12 | CMakeLists.txt | 3 ++- | 11 | CMakeLists.txt | 3 ++- |
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | 12 | 1 file changed, 2 insertions(+), 1 deletion(-) |
14 | 13 | ||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 14 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
16 | index 16b63308..b722d4fb 100644 | 15 | index 6444c374..e99b28d0 100644 |
17 | --- a/CMakeLists.txt | 16 | --- a/CMakeLists.txt |
18 | +++ b/CMakeLists.txt | 17 | +++ b/CMakeLists.txt |
19 | @@ -45,7 +45,8 @@ endif() | 18 | @@ -51,7 +51,8 @@ endif() |
19 | |||
20 | 20 | ||
21 | # build dependencies | 21 | # build dependencies |
22 | find_package(Gpgme REQUIRED) | 22 | -find_package(LibSolv 0.7.21 REQUIRED COMPONENTS ext) |
23 | -find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext) | ||
24 | +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) | 23 | +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) |
25 | +set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) | 24 | +set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) |
26 | find_package(OpenSSL REQUIRED) | ||
27 | 25 | ||
28 | 26 | ||
27 | # build dependencies via pkg-config | ||
diff --git a/meta/recipes-devtools/libdnf/libdnf/armarch.patch b/meta/recipes-devtools/libdnf/libdnf/armarch.patch new file mode 100644 index 0000000000..63debdb58f --- /dev/null +++ b/meta/recipes-devtools/libdnf/libdnf/armarch.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From aa0f8b65feec64420a9b7b61cfcc8bcce161e14b Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Thu, 9 Nov 2023 10:29:31 +0000 | ||
4 | Subject: [PATCH] libdnf: Fix arm arch mapping issues for qemuarmv5 | ||
5 | |||
6 | We change the way rpm architectures work, we make the machine name the default machine | ||
7 | specific package architecture. | ||
8 | |||
9 | This arm mapping code can work or in the case of qemuarmv5, it doesn't as it creates | ||
10 | armv5hl which doesn't exist and causes errrors. We can simply remove it, we don't need it. | ||
11 | |||
12 | Upstream-Status: Inappropriate [Relies on OE rpm config] | ||
13 | --- | ||
14 | libdnf/hy-util.cpp | 23 ----------------------- | ||
15 | 1 file changed, 23 deletions(-) | ||
16 | |||
17 | diff --git a/libdnf/hy-util.cpp b/libdnf/hy-util.cpp | ||
18 | index 9978c8e9..aa1369b6 100644 | ||
19 | --- a/libdnf/hy-util.cpp | ||
20 | +++ b/libdnf/hy-util.cpp | ||
21 | @@ -117,29 +117,6 @@ hy_detect_arch(char **arch) | ||
22 | if (uname(&un) < 0) | ||
23 | return DNF_ERROR_FAILED; | ||
24 | |||
25 | - if (!strncmp(un.machine, "armv", 4)) { | ||
26 | - /* un.machine is armvXE, where X is version number and E is | ||
27 | - * endianness (b or l); we need to add modifiers such as | ||
28 | - * h (hardfloat), n (neon). Neon is a requirement of armv8 so | ||
29 | - * as far as rpm is concerned armv8l is the equivilent of armv7hnl | ||
30 | - * (or 7hnb) so we don't explicitly add 'n' for 8+ as it's expected. */ | ||
31 | - char endian = un.machine[strlen(un.machine)-1]; | ||
32 | - char *modifier = un.machine + 5; | ||
33 | - while(isdigit(*modifier)) /* keep armv7, armv8, armv9, armv10, armv100, ... */ | ||
34 | - modifier++; | ||
35 | - if (getauxval(AT_HWCAP) & HWCAP_ARM_VFP) | ||
36 | - *modifier++ = 'h'; | ||
37 | - if ((atoi(un.machine+4) == 7) && (getauxval(AT_HWCAP) & HWCAP_ARM_NEON)) | ||
38 | - *modifier++ = 'n'; | ||
39 | - *modifier++ = endian; | ||
40 | - *modifier = 0; | ||
41 | - } | ||
42 | -#ifdef __MIPSEL__ | ||
43 | - if (!strcmp(un.machine, "mips")) | ||
44 | - strcpy(un.machine, "mipsel"); | ||
45 | - else if (!strcmp(un.machine, "mips64")) | ||
46 | - strcpy(un.machine, "mips64el"); | ||
47 | -#endif | ||
48 | *arch = g_strdup(un.machine); | ||
49 | return 0; | ||
50 | } | ||
diff --git a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch index e3784cc9e4..e4f6d447f1 100644 --- a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch +++ b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | libdnf: allow reproducible binary builds | 1 | From 25229773a9d4472235278bb45f75439e56630cee Mon Sep 17 00:00:00 2001 |
2 | From: Joe Slater <joe.slater@windriver.com> | ||
3 | Date: Wed, 22 Jul 2020 13:31:11 -0700 | ||
4 | Subject: [PATCH] libdnf: allow reproducible binary builds | ||
2 | 5 | ||
3 | Use a dummy directory for test data if not built WITH_TESTS. Allow for overriding | 6 | Use a dummy directory for test data if not built WITH_TESTS. Allow for overriding |
4 | TESTDATADIR, since the default is guaranteed to be wrong for target builds. | 7 | TESTDATADIR, since the default is guaranteed to be wrong for target builds. |
@@ -6,12 +9,16 @@ TESTDATADIR, since the default is guaranteed to be wrong for target builds. | |||
6 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
7 | 10 | ||
8 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 11 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
12 | --- | ||
13 | CMakeLists.txt | 7 ++++++- | ||
14 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
9 | 15 | ||
10 | 16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | |
17 | index 548a9137..c378e7d9 100644 | ||
11 | --- a/CMakeLists.txt | 18 | --- a/CMakeLists.txt |
12 | +++ b/CMakeLists.txt | 19 | +++ b/CMakeLists.txt |
13 | @@ -133,7 +133,12 @@ add_definitions(-DG_LOG_DOMAIN=\\"libdnf | 20 | @@ -132,7 +132,12 @@ add_definitions(-DGETTEXT_DOMAIN=\\"libdnf\\") |
14 | add_definitions(-D_FILE_OFFSET_BITS=64) | 21 | add_definitions(-DG_LOG_DOMAIN=\\"libdnf\\") |
15 | 22 | ||
16 | # tests | 23 | # tests |
17 | -add_definitions(-DTESTDATADIR=\\"${CMAKE_SOURCE_DIR}/data/tests\\") | 24 | -add_definitions(-DTESTDATADIR=\\"${CMAKE_SOURCE_DIR}/data/tests\\") |