svn commit: r350009 - in head/ports-mgmt/pkg-devel: . files

[Baptiste Daroussin]

Author: bapt
Date: Thu Apr  3 13:33:37 2014
New Revision: 350009
URL: http://svnweb.freebsd.org/changeset/ports/350009
QAT: https://qat.redports.org/buildarchive/r350009/

Log:
  Add the ability to specifiy the file where the ABI string will be determined
  from
  Enfore USES=libtool (the default libtool to not really respect CC and thus breaks
  cross building)

Added:
  head/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c   (contents, props changed)
Modified:
  head/ports-mgmt/pkg-devel/Makefile
  head/ports-mgmt/pkg-devel/pkg-plist

Modified: head/ports-mgmt/pkg-devel/Makefile
==============================================================================
--- head/ports-mgmt/pkg-devel/Makefile	Thu Apr  3 13:30:39 2014	(r350008)
+++ head/ports-mgmt/pkg-devel/Makefile	Thu Apr  3 13:33:37 2014	(r350009)
@@ -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

Added: head/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c	Thu Apr  3 13:33:37 2014	(r350009)
@@ -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);

Modified: head/ports-mgmt/pkg-devel/pkg-plist
==============================================================================
--- head/ports-mgmt/pkg-devel/pkg-plist	Thu Apr  3 13:30:39 2014	(r350008)
+++ head/ports-mgmt/pkg-devel/pkg-plist	Thu Apr  3 13:33:37 2014	(r350009)
@@ -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