libdnf: 0.60.0 -> 0.61.1
This commit is contained in:
parent
34463b2e38
commit
91ba4016a0
|
@ -1,57 +0,0 @@
|
|||
diff --git src/libdnf/config.h src/libdnf/config.h
|
||||
index 16121f6f..737d0bc4 100644
|
||||
--- src/libdnf/config.h
|
||||
+++ src/libdnf/config.h
|
||||
@@ -18,7 +18,12 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
+
|
||||
+#ifdef __APPLE__
|
||||
+#include <stdint.h>
|
||||
+#else
|
||||
#include <bits/wordsize.h>
|
||||
+#endif
|
||||
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
#include "config-32.h"
|
||||
diff --git src/libdnf/hy-iutil.cpp src/libdnf/hy-iutil.cpp
|
||||
index 497c560d..5de077fa 100644
|
||||
--- src/libdnf/hy-iutil.cpp
|
||||
+++ src/libdnf/hy-iutil.cpp
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <errno.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
-#include <linux/limits.h>
|
||||
+#include <limits.h>
|
||||
#include <pwd.h>
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
diff --git src/libdnf/hy-util.cpp src/libdnf/hy-util.cpp
|
||||
index 295fdc1b..9d584b8a 100644
|
||||
--- src/libdnf/hy-util.cpp
|
||||
+++ src/libdnf/hy-util.cpp
|
||||
@@ -24,7 +24,20 @@
|
||||
#include <ctype.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/stat.h>
|
||||
-#include <sys/auxv.h>
|
||||
+
|
||||
+// Darwin compatibility hacks
|
||||
+typedef int auxv_t;
|
||||
+#ifndef AT_HWCAP2
|
||||
+#define AT_HWCAP2 26
|
||||
+#endif
|
||||
+#ifndef AT_HWCAP
|
||||
+#define AT_HWCAP 16
|
||||
+#endif
|
||||
+static unsigned long getauxval(unsigned long type)
|
||||
+{
|
||||
+ unsigned long ret = 0;
|
||||
+ return ret;
|
||||
+}
|
||||
|
||||
// hawkey
|
||||
#include "dnf-types.h"
|
|
@ -3,17 +3,15 @@
|
|||
|
||||
gcc9Stdenv.mkDerivation rec {
|
||||
pname = "libdnf";
|
||||
version = "0.60.0";
|
||||
version = "0.61.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpm-software-management";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-cZlUhzmfplj2XEpWWwPfT/fiH2cj3lIc44UVrFHcl3s=";
|
||||
sha256 = "sha256-ad0Q/8FEaSqsuA6tVC5SB4bTrGJY/8Xb8S8zrsDIyVc=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gettext
|
||||
|
|
Loading…
Reference in a new issue