CVS commit: pkgsrc/net/ucspi-ssl

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Jun 21 19:41:05 UTC 2018

Modified Files:
        pkgsrc/net/ucspi-ssl: distinfo
Added Files:
        pkgsrc/net/ucspi-ssl/patches: patch-src_print-ld.sh

Log Message:
Don't autodetect -m64. Fixes ABI=32 build on Tribblix.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/ucspi-ssl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ucspi-ssl/patches/patch-src_print-ld.sh

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

Modified files:

Index: pkgsrc/net/ucspi-ssl/distinfo
diff -u pkgsrc/net/ucspi-ssl/distinfo:1.7 pkgsrc/net/ucspi-ssl/distinfo:1.8
--- pkgsrc/net/ucspi-ssl/distinfo:1.7   Mon Jun 18 11:00:21 2018
+++ pkgsrc/net/ucspi-ssl/distinfo       Thu Jun 21 19:41:05 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2018/06/18 11:00:21 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2018/06/21 19:41:05 schmonz Exp $
 
 SHA1 (ucspi-ssl-0.99d.tgz) = 4becb4dc26ae151b6017ef18d0330974eac40f77
 RMD160 (ucspi-ssl-0.99d.tgz) = 628b9fdb80f390465eec8d97684245c061ceca5a
 SHA512 (ucspi-ssl-0.99d.tgz) = 9e8f057dd0cda00ace623f0109fbf926f766515ec23480850ab74c2519ca1a6cb6fb04eab31a3fdfa861dbb285eaaf2a813e9db30a8fb70002c4e02379d7b5da
 Size (ucspi-ssl-0.99d.tgz) = 112640 bytes
 SHA1 (patch-src_print-dl.sh) = 456ae878c5116bbdfab1e9b4c049f6e4e80bc2b1
+SHA1 (patch-src_print-ld.sh) = f05f316eb6b95a3a9cb5726c9e7bb2d27dfc1b7b

Added files:

Index: pkgsrc/net/ucspi-ssl/patches/patch-src_print-ld.sh
diff -u /dev/null pkgsrc/net/ucspi-ssl/patches/patch-src_print-ld.sh:1.1
--- /dev/null   Thu Jun 21 19:41:05 2018
+++ pkgsrc/net/ucspi-ssl/patches/patch-src_print-ld.sh  Thu Jun 21 19:41:05 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_print-ld.sh,v 1.1 2018/06/21 19:41:05 schmonz Exp $
+
+Don't autodetect -m64.
+
+--- src/print-ld.sh.orig       2016-08-02 11:32:28.000000000 +0000
++++ src/print-ld.sh
+@@ -7,7 +7,8 @@ rm -f trycpp.o
+ 
+ flag=`cc -c tryssl.c -m64 2>&1 | wc -l` 
+ if [ $flag -eq 0 ]; then
+-  ld="$ld -m64"
++  #ld="$ld -m64"
++  ld="$ld"
+ fi
+ 
+ rm -f trycpp.o