summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2012-12-17 01:58:55 +0000
committerdholland <dholland@pkgsrc.org>2012-12-17 01:58:55 +0000
commit7e1aa20036e2fbea01f47066797d66b87f38b540 (patch)
tree5c8cf1be1817f497eae17a271c156c6dbae5ec0a /devel
parentbfee468975feb029a5730448907d42342daeee10 (diff)
downloadpkgsrc-7e1aa20036e2fbea01f47066797d66b87f38b540.tar.gz
Fix "libtool: compile: unable to infer tagged configuration" by not
overwriting pkgsrc's setting of $(CC). Also, make it build on amd64 netbsd (by cribbing two lines from the existing openbsd support) and add that to the list of PLATFORMs the package is ONLY_FOR. XXX: Why is this limited to netbsd PLATFORMs when it supports at least XXX: some other stuff internally?
Diffstat (limited to 'devel')
-rw-r--r--devel/st/Makefile5
-rw-r--r--devel/st/distinfo5
-rw-r--r--devel/st/patches/patch-aa23
-rw-r--r--devel/st/patches/patch-md_h15
4 files changed, 42 insertions, 6 deletions
diff --git a/devel/st/Makefile b/devel/st/Makefile
index 447160fee85..800b647cb64 100644
--- a/devel/st/Makefile
+++ b/devel/st/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/31 11:19:47 asau Exp $
+# $NetBSD: Makefile,v 1.16 2012/12/17 01:58:55 dholland Exp $
#
DISTNAME= st-1.8
@@ -9,7 +9,8 @@ MAINTAINER= gson@NetBSD.org
HOMEPAGE= http://state-threads.sourceforge.net/
COMMENT= Non-preemptive thread library for Internet applications
-ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-vax
+ONLY_FOR_PLATFORM= NetBSD-*-x86_64 NetBSD-*-i386 \
+ NetBSD-*-sparc NetBSD-*-vax
MAKE_JOBS_SAFE= no
USE_LIBTOOL= yes
diff --git a/devel/st/distinfo b/devel/st/distinfo
index d80d0508ee1..44245112932 100644
--- a/devel/st/distinfo
+++ b/devel/st/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2009/03/10 11:13:09 gson Exp $
+$NetBSD: distinfo,v 1.7 2012/12/17 01:58:55 dholland Exp $
SHA1 (st-1.8.tar.gz) = 3f9c9bfe0a6074ccfcb642c1b95320dba496b9e8
RMD160 (st-1.8.tar.gz) = 951c55807d2164c1a8f1fcde75d97aeb6a47a256
Size (st-1.8.tar.gz) = 106604 bytes
-SHA1 (patch-aa) = 81dccd050f11e06bee7c8c07870091741b49d3f7
+SHA1 (patch-aa) = 57fcd19a3768d198a874edddaf9f4395e002d243
SHA1 (patch-ab) = b1967d6ee1dcdd549f3f90f53f51aa253be2dc5c
+SHA1 (patch-md_h) = 1c542014ac3607908b7484642293b9e0a5709ac2
diff --git a/devel/st/patches/patch-aa b/devel/st/patches/patch-aa
index a4cbfa569a1..904c478ed77 100644
--- a/devel/st/patches/patch-aa
+++ b/devel/st/patches/patch-aa
@@ -1,7 +1,26 @@
-$NetBSD: patch-aa,v 1.4 2009/03/10 11:13:09 gson Exp $
+$NetBSD: patch-aa,v 1.5 2012/12/17 01:58:55 dholland Exp $
---- Makefile.orig 2007-03-14 04:34:20.000000000 +0200
+- honor pkgsrc CC, AR, LD, RANLIB (CC matters for libtool, the others less so)
+- use libtool
+- other previously uncommented stuff (XXX)
+
+--- Makefile.orig 2007-03-14 02:34:20.000000000 +0000
+++ Makefile
+@@ -56,10 +56,10 @@ VERSION = 1.8
+ # possible compilation options.
+ ##########################
+
+-CC = cc
+-AR = ar
+-LD = ld
+-RANLIB = ranlib
++#CC = cc
++#AR = ar
++#LD = ld
++#RANLIB = ranlib
+ LN = ln
+
+ SHELL = /bin/sh
@@ -184,6 +184,13 @@ LDFLAGS = -shared -soname=$(SONAME)
OTHER_FLAGS = -Wall
endif
diff --git a/devel/st/patches/patch-md_h b/devel/st/patches/patch-md_h
new file mode 100644
index 00000000000..f70de7cf874
--- /dev/null
+++ b/devel/st/patches/patch-md_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-md_h,v 1.1 2012/12/17 01:58:55 dholland Exp $
+
+Add amd64 support on NetBSD by cribbing from existing OpenBSD support.
+
+--- md.h~ 2007-03-14 02:53:10.000000000 +0000
++++ md.h
+@@ -482,6 +482,8 @@ extern void _st_md_cxt_restore(jmp_buf e
+ #define MD_JB_SP 0
+ #elif defined(__vax__)
+ #define MD_JB_SP 2
++#elif defined(__amd64__)
++#define MD_JB_SP 6
+ #else
+ #error Unknown CPU architecture
+ #endif