CVS commit: pkgsrc/devel/ffcall

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 13 12:21:39 UTC 2017

Modified Files:
        pkgsrc/devel/ffcall: distinfo
        pkgsrc/devel/ffcall/patches: patch-aa
Added Files:
        pkgsrc/devel/ffcall/patches: patch-callback_Makefile.in

Log Message:
Honor LDFLAGS.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ffcall/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ffcall/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ffcall/patches/patch-callback_Makefile.in

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

Modified files:

Index: pkgsrc/devel/ffcall/distinfo
diff -u pkgsrc/devel/ffcall/distinfo:1.13 pkgsrc/devel/ffcall/distinfo:1.14
--- pkgsrc/devel/ffcall/distinfo:1.13   Fri Aug 26 17:25:08 2016
+++ pkgsrc/devel/ffcall/distinfo        Thu Jul 13 12:21:39 2017
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2016/08/26 17:25:08 joerg Exp $
+$NetBSD: distinfo,v 1.14 2017/07/13 12:21:39 wiz Exp $
 
 SHA1 (ffcall-1.10.tar.gz) = 6b4fdc7bd38b434bbf3d65508a3d117fc8b349f3
 RMD160 (ffcall-1.10.tar.gz) = 910af54fae0b992ceb5620f155e301827d2e03c5
 SHA512 (ffcall-1.10.tar.gz) = dceb620907adae5bbbb52cf2d0b0c829242ad22adceb3186b7a887b7ba49e28b607c30179de6b5a0c46a90bd52f9963ce503ca0c69bc3ecf41e3556df094ddca
 Size (ffcall-1.10.tar.gz) = 914870 bytes
-SHA1 (patch-aa) = 13250616ed04a1a2135d7638dd6a83f86e635188
+SHA1 (patch-aa) = 208e3fe1d186e845e14c3623ac5b173923b113e9
 SHA1 (patch-ab) = 7e4b587a080af5530c7bd883a71b614162522320
 SHA1 (patch-ad) = 4cfba7c4ce9fb709d1e857433c5caad293ca9c29
 SHA1 (patch-ae) = 091132edde5d4360cdc3f0e72cc58833c6487181
@@ -14,6 +14,7 @@ SHA1 (patch-ah) = 07781ee5caef0ca98e9f15
 SHA1 (patch-ai) = 03a5a572e94ddbcb78dd11201e0afd91998d1e3a
 SHA1 (patch-aj) = 8db7daeb150db176dfb2f59ad9b4854cb1f895fd
 SHA1 (patch-avcall_avcall-x86__64.s) = a41ec9d5f2f6b64e8dca77d29cf82fa025ab954f
+SHA1 (patch-callback_Makefile.in) = d27730ed485f405c5287b1af7b76cfbeb122c85d
 SHA1 (patch-callback_vacall__r_vacall-x86_64.c) = 2e7e6cc3bd32461e905cb48a3bd470517c90bfb8
 SHA1 (patch-callback_vacall__r_vacall-x86__64.s) = eee81d24f58a57c1ef8164b9c8c70b0e086bda29
 SHA1 (patch-vacall_vacall-x86_64.c) = 299a34fe8530c6bf926b97d0d018a8b850b35a97

Index: pkgsrc/devel/ffcall/patches/patch-aa
diff -u pkgsrc/devel/ffcall/patches/patch-aa:1.3 pkgsrc/devel/ffcall/patches/patch-aa:1.4
--- pkgsrc/devel/ffcall/patches/patch-aa:1.3    Mon May 12 13:05:21 2014
+++ pkgsrc/devel/ffcall/patches/patch-aa        Thu Jul 13 12:21:39 2017
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2014/05/12 13:05:21 jperkin Exp $
+$NetBSD: patch-aa,v 1.4 2017/07/13 12:21:39 wiz Exp $
 
 Don't use pre-generated assembly on SunOS.
+Honor LDFLAGS.
 
 --- avcall/Makefile.in.orig    2004-01-25 17:34:21.000000000 +0000
 +++ avcall/Makefile.in
@@ -15,7 +16,7 @@ Don't use pre-generated assembly on SunO
  
  avcall-m88k.lo : $(srcdir)/avcall-m88k.s
        $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/avcall-m88k.s
-@@ -138,7 +138,11 @@ avcall-ia64.lo : $(srcdir)/avcall-ia64.s
+@@ -138,13 +138,17 @@ avcall-ia64.lo : $(srcdir)/avcall-ia64.s
        $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/avcall-ia64.s
  
  avcall-x86_64.lo : $(srcdir)/avcall-x86_64.s
@@ -28,3 +29,10 @@ Don't use pre-generated assembly on SunO
  
  structcpy.lo : $(srcdir)/structcpy.c
        $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) -c $(srcdir)/structcpy.c
+ 
+ libavcall.la : $(OBJECTS)
+-      $(LIBTOOL_LINK) $(CC) -o libavcall.la -rpath $(libdir) $(OBJECTS)
++      $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libavcall.la -rpath $(libdir) $(OBJECTS)
+ 
+ # Installs the library and include files only. Typically called with only
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.

Added files:

Index: pkgsrc/devel/ffcall/patches/patch-callback_Makefile.in
diff -u /dev/null pkgsrc/devel/ffcall/patches/patch-callback_Makefile.in:1.1
--- /dev/null   Thu Jul 13 12:21:39 2017
+++ pkgsrc/devel/ffcall/patches/patch-callback_Makefile.in      Thu Jul 13 12:21:39 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-callback_Makefile.in,v 1.1 2017/07/13 12:21:39 wiz Exp $
+
+Honor LDFLAGS.
+
+--- callback/Makefile.in.orig  2003-10-01 19:46:19.000000000 +0000
++++ callback/Makefile.in
+@@ -61,7 +61,7 @@ trampoline_r.h :
+       $(LN_S) trampoline_r/trampoline_r.h trampoline_r.h
+ 
+ libcallback.la : vacall_r/libvacall.la trampoline_r/libtrampoline.la
+-      $(LIBTOOL_LINK) $(CC) -o libcallback.la -rpath $(libdir) vacall_r/vacall.lo vacall_r/misc.lo vacall_r/structcpy.lo trampoline_r/*.lo
++      $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcallback.la -rpath $(libdir) vacall_r/vacall.lo vacall_r/misc.lo vacall_r/structcpy.lo trampoline_r/*.lo
+ 
+ # Installs the library and include files only. Typically called with only
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.