[pkgsrc/trunk]: pkgsrc/lang/gauche * Clean up the way this package was trying...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/gauche * Clean up the way this package was trying...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:16:41 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/936f63fb6713
branches:  trunk
changeset: 510585:936f63fb6713
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Mar 31 18:35:22 2006 +0000

description:
* Clean up the way this package was trying to pass in rpath flags for
  iconv and gdbm.  We now patch Makefile.in instead of the configure
  script and just pass in thr rpath flags via environment variables.

* Honor PKGINFODIR.

diffstat:

 lang/gauche/Makefile         |  28 ++++++++--------------------
 lang/gauche/PLIST            |   6 ++++--
 lang/gauche/distinfo         |   6 ++++--
 lang/gauche/options.mk       |   3 ++-
 lang/gauche/patches/patch-aa |  14 ++++++++++++--
 lang/gauche/patches/patch-af |  13 +++++++++++++
 lang/gauche/patches/patch-ag |  13 +++++++++++++
 7 files changed, 56 insertions(+), 27 deletions(-)

diffs (175 lines):

diff -r bec0c47e6ea8 -r 936f63fb6713 lang/gauche/Makefile
--- a/lang/gauche/Makefile      Fri Mar 31 17:59:05 2006 +0000
+++ b/lang/gauche/Makefile      Fri Mar 31 18:35:22 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/03/31 17:41:07 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2006/03/31 18:35:22 jlam Exp $
 #
 
 DISTNAME=      Gauche-0.8.6
@@ -15,37 +15,25 @@
 
 .include "options.mk"
 
-# This is ad-hoc.  TRT would be to fix configure scripts, but that
-# would be also very tedious...
-SUBST_CLASSES+=                lgdbm
-SUBST_STAGE.lgdbm=     pre-configure
-SUBST_FILES.lgdbm=     configure
-SUBST_SED.lgdbm=       -e 's|"-lgdbm"|"${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gdbm}/lib -lgdbm"|g'
-
 EVAL_PREFIX+=          SLIB_PREFIX=slib
 
 GNU_CONFIGURE= yes
 CONFIGURE_ARGS+=       --with-slib=${SLIB_PREFIX}/share/slib
-CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=       --enable-multibyte=utf-8
 CONFIGURE_ARGS+=       --enable-threads=none   # must match w/ boehm-gc
 CONFIGURE_ENV+=                AS="${CC} -x assembler-with-cpp -c"
 
-_WITH_ICONV_LIB=       ${BUILDLINK_LIBICONV_LDADD:M-l*:C/-l//}
-LDFLAGS+=              ${BUILDLINK_LIBICONV_LDADD}
+CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=       --with-iconv-lib=${BUILDLINK_LDADD.iconv:M-l*:S/-l//:Q}
+MAKE_ENV+=             ICONV_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
 
 USE_TOOLS+=            gzip makeinfo
 INFO_FILES=            gauche-refe.info gauche-refj.info
 
-post-install:
-       gzip -d ${PREFIX}/info/gauche-ref*gz
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
 
-.if !empty(_WITH_ICONV_LIB)
-CONFIGURE_ARGS+=       --with-iconv-lib=${_WITH_ICONV_LIB:Q}
-.else
-BUILDLINK_TRANSFORM+=  rm:-liconv
-.endif
+post-install:
+       gzip -d ${PREFIX}/${PKGINFODIR}/gauche-ref*gz
+
+.include "../../mk/bsd.pkg.mk"
diff -r bec0c47e6ea8 -r 936f63fb6713 lang/gauche/PLIST
--- a/lang/gauche/PLIST Fri Mar 31 17:59:05 2006 +0000
+++ b/lang/gauche/PLIST Fri Mar 31 18:35:22 2006 +0000
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.13 2006/02/16 18:09:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/03/31 18:35:22 jlam Exp $
 bin/gauche-cesconv
 bin/gauche-config
 bin/gauche-install
 bin/gauche-package
 bin/gosh
+info/gauche-refe.info
+info/gauche-refj.info
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/auxsys.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/binary.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/fcntl.so
@@ -59,8 +61,8 @@
 lib/gauche/${PKGVERSION}/include/gc_config_macros.h
 lib/gauche/${PKGVERSION}/include/gc_pthread_redirects.h
 lib/libgauche.so
+lib/libgauche.so.0
 lib/libgauche.so.${PKGVERSION}
-lib/libgauche.so.0
 man/man1/gauche-config.1
 man/man1/gosh.1
 share/aclocal/gauche.m4
diff -r bec0c47e6ea8 -r 936f63fb6713 lang/gauche/distinfo
--- a/lang/gauche/distinfo      Fri Mar 31 17:59:05 2006 +0000
+++ b/lang/gauche/distinfo      Fri Mar 31 18:35:22 2006 +0000
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.19 2006/03/31 17:40:12 jlam Exp $
+$NetBSD: distinfo,v 1.20 2006/03/31 18:35:22 jlam Exp $
 
 SHA1 (Gauche-0.8.6.tgz) = 8ce200011da2eff925c8ccf65502529df379f2b8
 RMD160 (Gauche-0.8.6.tgz) = e6986c2602926b6a5c16a41838212bd041a4fbae
 Size (Gauche-0.8.6.tgz) = 2881800 bytes
-SHA1 (patch-aa) = 0532c0fdd7d7d94528f476cce5111740c0a8f851
+SHA1 (patch-aa) = 21aa160a43ce7eb0de636dd422c8d9b59b71f8ee
 SHA1 (patch-ab) = 7c05e4e266078903871e13084c217ba6930275ce
 SHA1 (patch-ac) = 7e5e0056f6e1cf685edf8dd0bd5b7ea87b05348c
 SHA1 (patch-ad) = 25d6ed22d3a3d8d0360575ab8be5c5f1f0cf447e
 SHA1 (patch-ae) = 0f76f4ba32b21d9c34335713e17bac70b8f8f9fd
+SHA1 (patch-af) = 3f269e0c65830eeed9c5723cda02a9a66a8aa475
+SHA1 (patch-ag) = 97d19d33e2ae59bb894716bd289206b9b12ed38c
diff -r bec0c47e6ea8 -r 936f63fb6713 lang/gauche/options.mk
--- a/lang/gauche/options.mk    Fri Mar 31 17:59:05 2006 +0000
+++ b/lang/gauche/options.mk    Fri Mar 31 18:35:22 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/12/05 23:55:09 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2006/03/31 18:35:22 jlam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gauche
 PKG_SUPPORTED_OPTIONS= gdbm multibyte
@@ -15,6 +15,7 @@
 .if !empty(PKG_OPTIONS:Mgdbm)
 .  include "../../databases/gdbm/buildlink3.mk"
 PLIST_SUBST+=  USE_GDBM=''
+MAKE_ENV+=     GDBM_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gdbm}/lib
 .else
 PLIST_SUBST+=  USE_GDBM='@comment '
 .endif
diff -r bec0c47e6ea8 -r 936f63fb6713 lang/gauche/patches/patch-aa
--- a/lang/gauche/patches/patch-aa      Fri Mar 31 17:59:05 2006 +0000
+++ b/lang/gauche/patches/patch-aa      Fri Mar 31 18:35:22 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2006/03/31 17:40:12 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2006/03/31 18:35:22 jlam Exp $
 
---- configure.orig     2005-11-05 01:00:47.000000000 +0000
+--- configure.orig     2005-11-04 20:00:47.000000000 -0500
 +++ configure
 @@ -1631,7 +1631,7 @@ _ACEOF
  
@@ -94,3 +94,13 @@
      SHLIB_SO_CFLAGS="-fPIC"
      SHLIB_SO_LDFLAGS="$rpath -shared -o"
      SHLIB_SO_SUFFIX="so"
+@@ -9276,7 +9341,9 @@ fi;
+ if test "${with_iconv_lib+set}" = set; then
+   withval="$with_iconv_lib"
+ 
++  if test "x$withval" != x; then
+   ICONV_NAME="$with_iconv_lib"; ICONV_LIB="-l$with_iconv_lib"
++  fi
+ 
+ fi;
+ 
diff -r bec0c47e6ea8 -r 936f63fb6713 lang/gauche/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gauche/patches/patch-af      Fri Mar 31 18:35:22 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.3 2006/03/31 18:35:22 jlam Exp $
+
+--- ext/dbm/Makefile.in.orig   2005-08-28 18:51:19.000000000 -0400
++++ ext/dbm/Makefile.in
+@@ -12,6 +12,8 @@ SCMFILES = @DBM_SCMFILES@
+ GENERATED = Makefile dbmconf.h
+ XCLEANFILES = gdbm.c ndbm.c odbm.c *_head.c *_tail.c
+ 
++XLDFLAGS = $(GDBM_LDFLAGS)
++
+ all : $(LIBFILES)
+ 
+ gdbm_OBJECTS   = gdbm_head.$(OBJEXT) gdbm.$(OBJEXT) gdbm_tail.$(OBJEXT)
diff -r bec0c47e6ea8 -r 936f63fb6713 lang/gauche/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gauche/patches/patch-ag      Fri Mar 31 18:35:22 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.5 2006/03/31 18:35:22 jlam Exp $
+
+--- ext/charconv/Makefile.in.orig      2005-09-10 05:05:28.000000000 -0400
++++ ext/charconv/Makefile.in
+@@ -5,7 +5,7 @@ top_srcdir   = @top_srcdir@
+ include ../Makefile.ext
+ 
+ XCPPFLAGS = @ICONV_CPPFLAGS@
+-XLDFLAGS  = @ICONV_LDFLAGS@
++XLDFLAGS  = @ICONV_LDFLAGS@ $(ICONV_LDFLAGS)
+ XLIBS     = @ICONV_LIB@
+ 
+ SCM_CATEGORY = gauche
Prev by Date: [pkgsrc/trunk]: pkgsrc/math/gsl Move ICE workaround to a hacks.mk file.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Added mail/ingo version 1.1
Previous by Thread: [pkgsrc/trunk]: pkgsrc/math/gsl Move ICE workaround to a hacks.mk file.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Added mail/ingo version 1.1
Indexes:
Home | Main Index | Thread Index | Old Index