diff options
author | gson <gson@pkgsrc.org> | 2017-11-29 16:52:44 +0000 |
---|---|---|
committer | gson <gson@pkgsrc.org> | 2017-11-29 16:52:44 +0000 |
commit | c1a2aeb5ccedc4a8a49bd67ffecf762ab8d209d5 (patch) | |
tree | 0208698ddaf06b24533925e0037a9d74d302aa41 /devel | |
parent | a0478d6e16364a9031869ee6368447c04794055f (diff) | |
download | pkgsrc-c1a2aeb5ccedc4a8a49bd67ffecf762ab8d209d5.tar.gz |
Make devel/st build on Linux (tested on Debian 9).
Diffstat (limited to 'devel')
-rw-r--r-- | devel/st/distinfo | 6 | ||||
-rw-r--r-- | devel/st/patches/patch-aa | 20 | ||||
-rw-r--r-- | devel/st/patches/patch-ab | 18 |
3 files changed, 27 insertions, 17 deletions
diff --git a/devel/st/distinfo b/devel/st/distinfo index 46e2ecde5f9..02349bf4b11 100644 --- a/devel/st/distinfo +++ b/devel/st/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2016/04/28 13:49:04 gson Exp $ +$NetBSD: distinfo,v 1.11 2017/11/29 16:52:44 gson Exp $ SHA1 (st-1.9.tar.gz) = 316597c082743f0e32391ac84d435c428b76bf8b RMD160 (st-1.9.tar.gz) = 5daaa5a81f5cdc96465115e8093f702a2154844a SHA512 (st-1.9.tar.gz) = 66a63076993b36f52cad472dd39cfb0ed256c75153ac06573b062ff8453d2c630f8738e434b4da907dfeddfaf38291b5710904deb67962d5072f33238ffb8b84 Size (st-1.9.tar.gz) = 108756 bytes -SHA1 (patch-aa) = 07e9ae26981f6db25ac30a78cfe154008a5a7e5a -SHA1 (patch-ab) = b1967d6ee1dcdd549f3f90f53f51aa253be2dc5c +SHA1 (patch-aa) = 106df4696363fcdc26a43b305fffe8c68dd6bbeb +SHA1 (patch-ab) = 2bcc3365b0a74b5254c74febebd58ce95ee4cbc0 SHA1 (patch-md_h) = 954e32e14277d6875c0fe60d51d8c374c88c6c50 diff --git a/devel/st/patches/patch-aa b/devel/st/patches/patch-aa index 27325983fd6..cd58e01ed51 100644 --- a/devel/st/patches/patch-aa +++ b/devel/st/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2016/04/28 13:49:04 gson Exp $ +$NetBSD: patch-aa,v 1.7 2017/11/29 16:52:44 gson Exp $ - honor pkgsrc CC, AR, LD, RANLIB (CC matters for libtool, the others less so) - use libtool @@ -21,7 +21,16 @@ $NetBSD: patch-aa,v 1.6 2016/04/28 13:49:04 gson Exp $ LN = ln SHELL = /bin/sh -@@ -196,6 +196,13 @@ LDFLAGS = -shared -soname=$(SONAME) +@@ -181,7 +181,7 @@ OTHER_FLAGS = -fullwarn + endif + + ifeq ($(OS), LINUX) +-EXTRA_OBJS = $(TARGETDIR)/md.o ++EXTRA_OBJS = $(TARGETDIR)/md.lo + SFLAGS = -fPIC + LDFLAGS = -shared -soname=$(SONAME) -lc + OTHER_FLAGS = -Wall +@@ -196,6 +196,13 @@ LDFLAGS = -shared -soname=$(SONAME) OTHER_FLAGS = -Wall endif @@ -58,7 +67,7 @@ $NetBSD: patch-aa,v 1.6 2016/04/28 13:49:04 gson Exp $ DLIBRARY = $(TARGETDIR)/libst.$(DSO_SUFFIX).$(VERSION) EXAMPLES = examples -@@ -344,8 +351,7 @@ $(TARGETDIR): +@@ -344,12 +351,11 @@ $(TARGETDIR): if [ ! -d $(TARGETDIR) ]; then mkdir $(TARGETDIR); fi $(SLIBRARY): $(OBJS) @@ -68,6 +77,11 @@ $NetBSD: patch-aa,v 1.6 2016/04/28 13:49:04 gson Exp $ rm -f obj; $(LN) $(LNFLAGS) $(TARGETDIR) obj $(DLIBRARY): $(OBJS:%.o=%-pic.o) +- $(LD) $(LDFLAGS) $^ -o $@ ++ ${LIBTOOL} --mode=link --tag=CC $(LD) $(LDFLAGS) $^ -o $@ + if test "$(LINKNAME)"; then \ + cd $(TARGETDIR); \ + rm -f $(SONAME) $(LINKNAME); \ @@ -361,11 +367,11 @@ $(HEADER): public.h rm -f $@ cp public.h $@ diff --git a/devel/st/patches/patch-ab b/devel/st/patches/patch-ab index 5e7ea21cb48..951e343cfdb 100644 --- a/devel/st/patches/patch-ab +++ b/devel/st/patches/patch-ab @@ -1,20 +1,16 @@ -$NetBSD: patch-ab,v 1.3 2009/03/10 11:13:09 gson Exp $ +$NetBSD: patch-ab,v 1.4 2017/11/29 16:52:44 gson Exp $ ---- examples/Makefile.orig 2004-01-11 02:15:17.000000000 +0200 +--- examples/Makefile.orig 2009-10-01 18:35:55.000000000 +0000 +++ examples/Makefile -@@ -60,9 +60,9 @@ CFLAGS = - OTHER_FLAGS = +@@ -61,7 +61,7 @@ OTHER_FLAGS = OBJDIR = $(DEPTH)/$(TARGETDIR) --INCDIR = $(DEPTH)/$(TARGETDIR) + INCDIR = $(DEPTH)/$(TARGETDIR) -LIBST = $(OBJDIR)/libst.a --HEADER = $(INCDIR)/st.h -+INCDIR = $(DEPTH) -+LIBST = $(DEPTH)/libst.la -+HEADER = $(DEPTH)/st.h ++LIBST = $(OBJDIR)/libst.la + HEADER = $(INCDIR)/st.h LIBRESOLV = - EXTRALIBS = @@ -70,7 +70,7 @@ EXTRALIBS = ifeq ($(OS),) EXAMPLES = unknown @@ -24,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2009/03/10 11:13:09 gson Exp $ endif -@@ -94,17 +94,17 @@ endif +@@ -98,17 +98,17 @@ endif all: $(EXAMPLES) |