[pkgsrc/trunk]: pkgsrc/devel/libiberty nb1: Install ansidecl.h as libiberty_d...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ab5b55c8198c
branches:  trunk
changeset: 487704:ab5b55c8198c
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Jan 18 21:58:55 2005 +0000

description:
nb1: Install ansidecl.h as libiberty_decl.h (to avoid collision).  Done as
patches rather than altering custom tarball so as to keep the tarball as
close to FSF's source as possible.

Add application.mk convenience include to add to CPPFLAGS and LIBS enough
glue to use libiberty in a gcc-based app compile.

diffstat:

 devel/libiberty/Makefile         |  11 ++++++++---
 devel/libiberty/PLIST            |   3 ++-
 devel/libiberty/application.mk   |  14 ++++++++++++++
 devel/libiberty/buildlink3.mk    |   5 +++--
 devel/libiberty/distinfo         |   3 ++-
 devel/libiberty/patches/patch-aa |  13 +++++++++++++
 6 files changed, 42 insertions(+), 7 deletions(-)

diffs (101 lines):

diff -r f6f0ef2ccd03 -r ab5b55c8198c devel/libiberty/Makefile
--- a/devel/libiberty/Makefile  Tue Jan 18 20:00:46 2005 +0000
+++ b/devel/libiberty/Makefile  Tue Jan 18 21:58:55 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/06/05 16:32:02 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2005/01/18 21:58:55 tv Exp $
 #
 
 DISTNAME=              libiberty-1.0
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          http://www.johnrshannon.com/NetBSD/
 
@@ -16,8 +17,12 @@
 
 INSTALLATION_DIRS=     include lib
 
+post-extract:
+       ${CP} -f ${WRKSRC}/include/ansidecl.h ${WRKSRC}/include/libiberty_decl.h
+
 do-install:
-       ${INSTALL_LIB} ${WRKSRC}/libiberty/libiberty.a ${PREFIX}/lib
-       ${INSTALL_DATA} ${WRKSRC}/include/libiberty.h ${PREFIX}/include
+       ${INSTALL_LIB} ${WRKSRC}/libiberty/libiberty.a ${PREFIX}/lib/
+       ${INSTALL_DATA} ${WRKSRC}/include/libiberty_decl.h ${PREFIX}/include/
+       ${INSTALL_DATA} ${WRKSRC}/include/libiberty.h ${PREFIX}/include/
 
 .include "../../mk/bsd.pkg.mk"
diff -r f6f0ef2ccd03 -r ab5b55c8198c devel/libiberty/PLIST
--- a/devel/libiberty/PLIST     Tue Jan 18 20:00:46 2005 +0000
+++ b/devel/libiberty/PLIST     Tue Jan 18 21:58:55 2005 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/02 11:28:38 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/18 21:58:55 tv Exp $
 include/libiberty.h
+include/libiberty_decl.h
 lib/libiberty.a
diff -r f6f0ef2ccd03 -r ab5b55c8198c devel/libiberty/application.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libiberty/application.mk    Tue Jan 18 21:58:55 2005 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: application.mk,v 1.1 2005/01/18 21:58:55 tv Exp $
+# Convenience header to help pull libiberty into an application's build.
+
+.include "../../mk/bsd.prefs.mk"
+
+# currently requires GCC for "-include"
+.if empty(PKGSRC_COMPILER:Mgcc)
+PKG_FAIL_REASON+=      "libiberty compatibility build requires gcc compiler"
+.endif
+
+.include "../../devel/libiberty/buildlink3.mk"
+
+CPPFLAGS+=             -include libiberty.h
+LIBS+=                 -liberty
diff -r f6f0ef2ccd03 -r ab5b55c8198c devel/libiberty/buildlink3.mk
--- a/devel/libiberty/buildlink3.mk     Tue Jan 18 20:00:46 2005 +0000
+++ b/devel/libiberty/buildlink3.mk     Tue Jan 18 21:58:55 2005 +0000
@@ -1,4 +1,5 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/06/02 11:28:38 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/01/18 21:58:55 tv Exp $
+
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 LIBIBERTY_BUILDLINK3_MK:=      ${LIBIBERTY_BUILDLINK3_MK}+
 
@@ -10,7 +11,7 @@
 BUILDLINK_PACKAGES+=   libiberty
 
 .if !empty(LIBIBERTY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libiberty+=  libiberty>=1.0
+BUILDLINK_DEPENDS.libiberty+=  libiberty>=1.0nb1
 BUILDLINK_PKGSRCDIR.libiberty?=        ../../devel/libiberty
 .endif # LIBIBERTY_BUILDLINK3_MK
 BUILDLINK_DEPMETHOD.libiberty?= build
diff -r f6f0ef2ccd03 -r ab5b55c8198c devel/libiberty/distinfo
--- a/devel/libiberty/distinfo  Tue Jan 18 20:00:46 2005 +0000
+++ b/devel/libiberty/distinfo  Tue Jan 18 21:58:55 2005 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/02 11:28:38 shannonjr Exp $
+$NetBSD: distinfo,v 1.2 2005/01/18 21:58:55 tv Exp $
 
 SHA1 (libiberty-1.0.tar.gz) = e0ad9a4ae0e1d2be67a14d03e7e8840ab01dc2d5
 Size (libiberty-1.0.tar.gz) = 1210416 bytes
+SHA1 (patch-aa) = b3bd46fe9fd48206ae62f2462ae5f192a6848239
diff -r f6f0ef2ccd03 -r ab5b55c8198c devel/libiberty/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libiberty/patches/patch-aa  Tue Jan 18 21:58:55 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/01/18 21:58:55 tv Exp $
+
+--- include/libiberty.h.orig   2005-01-18 16:43:34.000000000 -0500
++++ include/libiberty.h
+@@ -39,7 +39,7 @@
+ extern "C" {
+ #endif
+ 
+-#include "ansidecl.h"
++#include "libiberty_decl.h"
+ 
+ #ifdef ANSI_PROTOTYPES
+ /* Get a definition for size_t.  */