Skip to content
This repository has been archived by the owner on Sep 29, 2022. It is now read-only.

Commit

Permalink
libalpm: New package
Browse files Browse the repository at this point in the history
  • Loading branch information
mingwandroid committed Jun 11, 2016
1 parent 05257f4 commit 788f012
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 0 deletions.
41 changes: 41 additions & 0 deletions libalpm/0001-AC_MSG_ERROR-WARN-on-bash-4.1.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From 39ea1502f73b87ac3303e007301c441ac2b56805 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <[email protected]>
Date: Wed, 9 Mar 2016 21:23:53 +0000
Subject: [PATCH 1/2] AC_MSG_ERROR -> WARN on bash < 4.1.0

Since we only want libalpm and not pacman itself, that
the bash scripts won't work isn't a problem.

We want libalpm for converting MSYS2 packages to Conda
packages.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git configure.ac configure.ac
index dd4ac04..76555ba 100644
--- configure.ac
+++ configure.ac
@@ -203,7 +203,7 @@ AS_IF([test "x$BASH_SHELL" = "xfalse"],
ok=no
fi
if test "$ok" = "no"; then
- AC_MSG_ERROR([*** bash >= 4.1.0 is required for pacman scripts])
+ AC_MSG_WARN([*** bash >= 4.1.0 is required for pacman scripts])
fi
unset bash_version_major bash_version_minor ok])

--- configure
+++ configure
@@ -13084,7 +13084,8 @@
ok=no
fi
if test "$ok" = "no"; then
- as_fn_error $? "*** bash >= 4.1.0 is required for pacman scripts" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** bash >= 4.1.0 is required for pacman scripts" >&5
+$as_echo "$as_me: WARNING: *** bash >= 4.1.0 is required for pacman scripts" >&2;}
fi
unset bash_version_major bash_version_minor ok
fi
--
2.5.4 (Apple Git-61)
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
From 10c048e7fdd4c17c3b87966ccdf3da810b66f831 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <[email protected]>
Date: Tue, 15 Mar 2016 11:23:35 +0000
Subject: [PATCH 2/2] ifndef HAVE_LIBGPGME silently convert
0 to ALPM_SIG_USE_DEFAULT

Added for pyalpm on Anaconda

.. since it's the default value that's passed by:

PacmanConfig.apply(h)
.. to
..
h.register_syncdb(repo, 0)
---
lib/libalpm/be_sync.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)

diff --git lib/libalpm/be_sync.c lib/libalpm/be_sync.c
index 32a669d..651d6b2 100644
--- lib/libalpm/be_sync.c
+++ lib/libalpm/be_sync.c
@@ -765,7 +765,21 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename,
_alpm_log(handle, ALPM_LOG_DEBUG, "registering sync database '%s'\n", treename);

#ifndef HAVE_LIBGPGME
- if(level != ALPM_SIG_USE_DEFAULT) {
+ /* Silently convert 0 to ALPM_SIG_USE_DEFAULT
+
+ Added for pyalpm on Anaconda
+
+ .. since it's the value that's passed by:
+
+ PacmanConfig.apply(h)
+ .. to
+ ..
+ h.register_syncdb(repo, 0)
+ */
+ if (level == 0)
+ level = ALPM_SIG_USE_DEFAULT;
+
+ if(level != ALPM_SIG_USE_DEFAULT) {
RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL);
}
#endif
--
2.5.4 (Apple Git-61)

9 changes: 9 additions & 0 deletions libalpm/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

./configure --prefix=${PREFIX} CPPFLAGS="-DDEBUG" CFLAGS="-O0 -g"
# Because we patch configure{,.ac} due to OS X being stuck on bash 3:
# .. : 'Prerequisite `configure.ac' is newer than target `aclocal.m4'.
# and: 'aclocal-1.15: command not found' (we've only got 1.14 at present).
touch aclocal.m4 Makefile.in
make -j"${CPU_COUNT}"
make install
31 changes: 31 additions & 0 deletions libalpm/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package:
name: libalpm
version: 5.0.1

source:
fn: pacman-5.0.1.tar.gz
url: https://sources.archlinux.org/other/pacman/pacman-5.0.1.tar.gz
md5: 377a2664d6007d72d6d8a126add83bcf
patches:
- 0001-AC_MSG_ERROR-WARN-on-bash-4.1.0.patch
- 0002-ifndef-HAVE_LIBGPGME-silently-convert-ALPM_SIG_PACKA.patch

requirements:
build:
- autoconf # [not linux]
- automake # [not linux]
- pkg-config # [not linux]
- gettext # [not unix]
- pkg-config # [win]
- msys2-gcc # [win]
- libarchive
- curl
# - gpgme # [not osx]

build:
number: 0

about:
home: http://www.archlinux.org/pacman/
summary: A library-based package manager with dependency support (lib only)
license: GPL

0 comments on commit 788f012

Please sign in to comment.