CVS commit: pkgsrc/devel/libtecla

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar 15 23:41:54 UTC 2020

Modified Files:
        pkgsrc/devel/libtecla: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/libtecla/patches: patch-configure

Log Message:
libtecla: Always link shared. Honour LDFLAGS.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/libtecla/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libtecla/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libtecla/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libtecla/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libtecla/Makefile
diff -u pkgsrc/devel/libtecla/Makefile:1.16 pkgsrc/devel/libtecla/Makefile:1.17
--- pkgsrc/devel/libtecla/Makefile:1.16 Wed Oct 31 11:17:22 2012
+++ pkgsrc/devel/libtecla/Makefile      Sun Mar 15 23:41:54 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2012/10/31 11:17:22 asau Exp $
+# $NetBSD: Makefile,v 1.17 2020/03/15 23:41:54 tnn Exp $
 
 DISTNAME=      libtecla-1.6.1
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  http://www.astro.caltech.edu/~mcs/tecla/
 

Index: pkgsrc/devel/libtecla/PLIST
diff -u pkgsrc/devel/libtecla/PLIST:1.2 pkgsrc/devel/libtecla/PLIST:1.3
--- pkgsrc/devel/libtecla/PLIST:1.2     Mon Feb 21 14:56:07 2005
+++ pkgsrc/devel/libtecla/PLIST Sun Mar 15 23:41:54 2020
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/21 14:56:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/03/15 23:41:54 tnn Exp $
 bin/enhance
 include/libtecla.h
 lib/libtecla.a
+lib/libtecla.so
+lib/libtecla.so.1
+lib/libtecla.so.${PKGVERSION}
 man/man1/enhance.1
 man/man3/cfc_file_start.3
 man/man3/cfc_literal_escapes.3

Index: pkgsrc/devel/libtecla/distinfo
diff -u pkgsrc/devel/libtecla/distinfo:1.6 pkgsrc/devel/libtecla/distinfo:1.7
--- pkgsrc/devel/libtecla/distinfo:1.6  Tue Nov  3 03:27:45 2015
+++ pkgsrc/devel/libtecla/distinfo      Sun Mar 15 23:41:54 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 03:27:45 agc Exp $
+$NetBSD: distinfo,v 1.7 2020/03/15 23:41:54 tnn Exp $
 
 SHA1 (libtecla-1.6.1.tar.gz) = 99c82990e7a41050211e4a449e50e20ee511c284
 RMD160 (libtecla-1.6.1.tar.gz) = 024f05583dc78bee1a686054799ce32c86890484
 SHA512 (libtecla-1.6.1.tar.gz) = 89d550868c99739b5cfd0ddba45f61d9a8fd1454c7044f29db6cced9cd1de83b895409706a8b85024d6c75678469a4b8b39dd184322d01e1ab6b5faf03c90fc7
 Size (libtecla-1.6.1.tar.gz) = 518995 bytes
 SHA1 (patch-aa) = f65278db23070f97d01bbb000b5d05e8448d3b77
+SHA1 (patch-configure) = 16200249075ab7379e3a0f03331b9265862742b0

Added files:

Index: pkgsrc/devel/libtecla/patches/patch-configure
diff -u /dev/null pkgsrc/devel/libtecla/patches/patch-configure:1.1
--- /dev/null   Sun Mar 15 23:41:54 2020
+++ pkgsrc/devel/libtecla/patches/patch-configure       Sun Mar 15 23:41:54 2020
@@ -0,0 +1,59 @@
+$NetBSD: patch-configure,v 1.1 2020/03/15 23:41:54 tnn Exp $
+
+Always link shared. Honour LDFLAGS.
+
+--- configure.orig     2004-11-04 01:16:58.000000000 +0000
++++ configure
+@@ -4152,7 +4152,7 @@ _ACEOF
+ 
+   SHARED_EXT=".so.${MAJOR_VER}"
+   SHARED_ALT=".so"
+-  LINK_SHARED="$LD"' -G -M $$(srcdir)/libtecla.map -o $$@ -h $$(@F) -z defs -i $$(LIB_OBJECTS) $$(LIBS) -lc'
++  LINK_SHARED="$LD"' $$(LDFLAGS) -G -M $$(srcdir)/libtecla.map -o $$@ -h $$(@F) -z defs -i $$(LIB_OBJECTS) $$(LIBS) -lc'
+   SHARED_CFLAGS="-Kpic"
+   case $CC in
+   */cc|cc) SHARED_CFLAGS="$SHARED_CFLAGS -xstrconst" ;;
+@@ -4172,7 +4172,7 @@ _ACEOF
+   FILE_MANDIR="man4"
+   FILE_MANEXT="4"
+   ;;
+-*linux*)
++*linux*|*netbsd*)
+   SHARED_EXT=".so.${MAJOR_VER}.${MINOR_VER}.${MICRO_VER}"
+   SHARED_ALT=".so .so.${MAJOR_VER}"
+ 
+@@ -4200,7 +4200,7 @@ echo "${ECHO_T}$tecla_cv_gnu_ld_script" 
+     VERSION_OPT=''
+   fi
+ 
+-  LINK_SHARED="$LD"' -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc'
++  LINK_SHARED="$LD"' $$(LDFLAGS) -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc'
+   SHARED_CFLAGS="-fpic"
+ 
+ 
+@@ -4219,7 +4219,7 @@ echo "${ECHO_T}$tecla_cv_gnu_ld_script" 
+ *darwin*)
+   SHARED_EXT=".${MAJOR_VER}.${MINOR_VER}.${MICRO_VER}.dylib"
+   SHARED_ALT=".dylib .${MAJOR_VER}.dylib"
+-  LINK_SHARED='$(CC) -o $$@ -dynamiclib -flat_namespace -undefined suppress -compatibility_version '${MAJOR_VER}.${MINOR_VER}' -current_version '${MAJOR_VER}.${MINOR_VER}.${MICRO_VER}' 
-install_name '${libdir}'/$$@ $$(LIB_OBJECTS)'
++  LINK_SHARED='$(CC) $$(LDFLAGS) -o $$@ -dynamiclib -flat_namespace -undefined suppress -compatibility_version '${MAJOR_VER}.${MINOR_VER}' -current_version '${MAJOR_VER}.${MINOR_VER}.${MICRO_VER}' 
-install_name '${libdir}'/$$@ $$(LIB_OBJECTS)'
+   SHARED_CFLAGS=""
+   ;;
+ *dec-osf*)
+@@ -4232,7 +4232,7 @@ _ACEOF
+   SHARED_EXT=".so.${MAJOR_VER}"
+   SHARED_ALT=".so"
+   VERSION_OPT='--version-script=$$(srcdir)/libtecla.map'
+-  LINK_SHARED='ld -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc'
++  LINK_SHARED='ld $$(LDFLAGS) -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc'
+   SHARED_CFLAGS="-fpic"
+   ;;
+ mips-sgi-irix*)
+@@ -4254,7 +4254,6 @@ if test "$GCC"_ = "yes"_ && test "$LINK_
+     SHARED_CFLAGS=""
+     ;;
+   esac
+-  LINK_SHARED="$LINK_SHARED `gcc -print-libgcc-file-name`"
+ fi
+ 
+