diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-04-03 13:33:37 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-04-03 13:33:37 +0000 |
| commit | 61ca29f0fc2d5389295ca005f112efde1a01810a (patch) | |
| tree | a4c850b11f720311aef3606efe67ad136d49c872 /ports-mgmt | |
| parent | 33c20959d88bc9b2951f90769a74b997d1163940 (diff) | |
| download | ports-61ca29f0fc2d5389295ca005f112efde1a01810a.tar.gz ports-61ca29f0fc2d5389295ca005f112efde1a01810a.zip | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c | 25 | ||||
| -rw-r--r-- | ports-mgmt/pkg-devel/pkg-plist | 1 |
3 files changed, 28 insertions, 1 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 53d769b6fbc0..0750f95300c5 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.3.0.a7 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= \ http://files.etoilebsd.net/pkg/ \ @@ -21,7 +22,7 @@ NO_CCACHE= yes WITH_DEBUG= yes CFLAGS+= -O0 -g USE_LDCONFIG= yes -USES= tar:xz +USES= tar:xz libtool GNU_CONFIGURE= yes # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD diff --git a/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c b/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c new file mode 100644 index 000000000000..587a06b94fb2 --- /dev/null +++ b/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c @@ -0,0 +1,25 @@ +diff --git a/libpkg/pkg_elf.c b/libpkg/pkg_elf.c +index 507e09d..b404cc0 100644 +--- libpkg/pkg_elf.c ++++ libpkg/pkg_elf.c +@@ -640,6 +640,11 @@ + int ret = EPKG_OK; + int i; + const char *arch, *abi, *endian_corres_str, *wordsize_corres_str, *fpu; ++ const char *path; ++ ++ path = getenv("ABI_FILE"); ++ if (path == NULL) ++ path = _PATH_BSHELL; + + if (elf_version(EV_CURRENT) == EV_NONE) { + pkg_emit_error("ELF library initialization failed: %s", +@@ -647,7 +652,7 @@ + return (EPKG_FATAL); + } + +- if ((fd = open(_PATH_BSHELL, O_RDONLY)) < 0) { ++ if ((fd = open(path, O_RDONLY)) < 0) { + pkg_emit_errno("open", _PATH_BSHELL); + snprintf(dest, sz, "%s", "unknown"); + return (EPKG_FATAL); diff --git a/ports-mgmt/pkg-devel/pkg-plist b/ports-mgmt/pkg-devel/pkg-plist index cc40dd66bdd3..7c4316db9ff9 100644 --- a/ports-mgmt/pkg-devel/pkg-plist +++ b/ports-mgmt/pkg-devel/pkg-plist @@ -9,6 +9,7 @@ include/pkg.h lib/libpkg.a lib/libpkg.so lib/libpkg.so.2 +lib/libpkg.so.2.0.0 libdata/pkgconfig/pkg.pc man/man3/pkg_printf.3.gz man/man3/pkg_repos.3.gz |