diff options
| author | cherry <cherry> | 2010-08-28 05:25:31 +0000 |
|---|---|---|
| committer | cherry <cherry> | 2010-08-28 05:25:31 +0000 |
| commit | 01deabea78ca60f2c041c0b4257637fddab47bc4 (patch) | |
| tree | 18e8bf8a4590b95ad93b794b6bc3d4ec35fcc24c | |
| parent | 079dfb05e7e587cef80d1b6be9f618fde6b1e7c0 (diff) | |
| download | pkgsrc-01deabea78ca60f2c041c0b4257637fddab47bc4.tar.gz | |
Force use of elf_repl.h (libelf's own elf.h replacement headers)
instead of NetBSD's own elf.h.
See: http://mail-index.netbsd.org/tech-toolchain/2010/08/20/msg001355.html
| -rw-r--r-- | devel/libelf/Makefile | 6 | ||||
| -rw-r--r-- | devel/libelf/distinfo | 3 | ||||
| -rw-r--r-- | devel/libelf/patches/patch-ac | 24 |
3 files changed, 31 insertions, 2 deletions
diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile index 2f6a1faa0e5..111a10193cd 100644 --- a/devel/libelf/Makefile +++ b/devel/libelf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2009/11/15 21:26:51 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2010/08/28 05:25:31 cherry Exp $ # DISTNAME= libelf-0.8.13 @@ -17,6 +17,10 @@ INSTALL_MAKE_FLAGS+= instroot=${DESTDIR} USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes +USE_TOOLS+= autoconf + +pre-configure: + (cd ${WRKSRC} && autoconf) CONFIGURE_ARGS+= --disable-shared CONFIGURE_ARGS+= --disable-compat diff --git a/devel/libelf/distinfo b/devel/libelf/distinfo index cab997c63fe..81747faec9e 100644 --- a/devel/libelf/distinfo +++ b/devel/libelf/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.5 2009/11/15 21:26:51 wiz Exp $ +$NetBSD: distinfo,v 1.6 2010/08/28 05:25:31 cherry Exp $ SHA1 (libelf-0.8.13.tar.gz) = c1d6ac5f182d19dd685c4dfd74eedbfe3992425d RMD160 (libelf-0.8.13.tar.gz) = 06962fbbcd91da25f02b964ad9513b9536f67baa Size (libelf-0.8.13.tar.gz) = 148529 bytes SHA1 (patch-aa) = bb70182806c0541e46af884e324d6ae2b8831665 SHA1 (patch-ab) = d04cb8da2a84478b15d4ff71cc45e30fc35d1a23 +SHA1 (patch-ac) = 3ab7c2bd85382c865f5abfbba26f8a3cc9a5550e diff --git a/devel/libelf/patches/patch-ac b/devel/libelf/patches/patch-ac new file mode 100644 index 00000000000..5a82332791a --- /dev/null +++ b/devel/libelf/patches/patch-ac @@ -0,0 +1,24 @@ +$NetBSD: patch-ac,v 1.1 2010/08/28 05:25:31 cherry Exp $ + +--- configure.in.orig 2008-05-23 08:17:56.000000000 +0000 ++++ configure.in +@@ -60,10 +60,19 @@ AC_CACHE_CHECK([if ${CC} can compile elf + [libelf_cv_elf_h_works=yes], + [libelf_cv_elf_h_works=no]) + ]) ++ ++# NetBSD defines a type Elf64_Quarter ++# We don't use the NetBSD elf.h because of 64bit breakage ++# See: http://mail-index.netbsd.org/tech-toolchain/2010/08/20/msg001355.html ++ ++AC_CACHE_CHECK([for Elf64_Quarter], libelf_cv_dummyelf_h_works, ++ [libelf_cv_elf_h_works=no]) ++ + if test "$libelf_cv_elf_h_works" = no; then + ac_cv_header_elf_h=no + ac_cv_header_sys_elf_h=no + fi ++ + if test "$ac_cv_header_elf_h" = yes; then + AC_DEFINE(__LIBELF_HEADER_ELF_H, [<elf.h>]) + elif test "$ac_cv_header_sys_elf_h" = yes; then |