summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtb <jtb@pkgsrc.org>2001-04-19 21:36:30 +0000
committerjtb <jtb@pkgsrc.org>2001-04-19 21:36:30 +0000
commit04a92e30ac56bc62a25ceca6dd9915a60fa402c2 (patch)
tree64f1b7c596002770cc26573b0d9d58e63bc5b893
parent942d775f8a56bd9b73453f623497c4d278d81bf1 (diff)
downloadpkgsrc-04a92e30ac56bc62a25ceca6dd9915a60fa402c2.tar.gz
Build libx2sys before the x2sys executables.
-rw-r--r--graphics/GMT/distinfo4
-rw-r--r--graphics/GMT/patches/patch-at7
2 files changed, 6 insertions, 5 deletions
diff --git a/graphics/GMT/distinfo b/graphics/GMT/distinfo
index 8c065a8bebb..bd787e486e5 100644
--- a/graphics/GMT/distinfo
+++ b/graphics/GMT/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/19 21:06:04 jtb Exp $
+$NetBSD: distinfo,v 1.4 2001/04/19 21:36:30 jtb Exp $
SHA1 (GMT3.4/GMT3.4_progs.tar.bz2) = b9fa8f60fe20ff9509ef3ebdf15fcc74e01d3f95
Size (GMT3.4/GMT3.4_progs.tar.bz2) = 551406 bytes
@@ -34,7 +34,7 @@ SHA1 (patch-ap) = 3475a19a50375dd50aba4ac0dda0d55acc085635
SHA1 (patch-aq) = cb36055875a8de6a7fa894b2b747dd148c7a132e
SHA1 (patch-ar) = f5628cff11b6330207c3c87217c8c00eb2f596e5
SHA1 (patch-as) = 42da16147de379bc55a0f6e0f4e7aeb62cfc9843
-SHA1 (patch-at) = 5a33fbc5231cdf0fe569be5f87e7ac34b5393829
+SHA1 (patch-at) = 4d85b3961c88c95652a58a76fa5eadf32399a01f
SHA1 (patch-au) = d4ac8225cdd83f81b71af7ca26d79a45bb76e283
SHA1 (patch-av) = fcc8aafb4a8163c0eb38744b9c7a05162d57db08
SHA1 (patch-aw) = 52375a2781c5e8085d84dbee245b6bae2d6eb2cf
diff --git a/graphics/GMT/patches/patch-at b/graphics/GMT/patches/patch-at
index bed354ac275..33ebef41b8f 100644
--- a/graphics/GMT/patches/patch-at
+++ b/graphics/GMT/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.2 2001/04/19 20:51:33 jtb Exp $
+$NetBSD: patch-at,v 1.3 2001/04/19 21:36:31 jtb Exp $
--- src/x2sys/makefile.orig Wed Apr 11 19:58:09 2001
+++ src/x2sys/makefile
@@ -21,7 +21,8 @@ $NetBSD: patch-at,v 1.2 2001/04/19 20:51:33 jtb Exp $
+libx2sys.la: x2sys.o
+ $(LIBTOOL) $(CC) -o libx2sys.la x2sys.lo --version-info 0:0 -rpath $(libdir)
- all: $(XSYSTEM) libx2sys.a
+-all: $(XSYSTEM) libx2sys.a
++all: libx2sys.la $(XSYSTEM)
install: all
for i in $(XSYSTEM); do \
@@ -45,7 +46,7 @@ $NetBSD: patch-at,v 1.2 2001/04/19 20:51:33 jtb Exp $
$(XSYSTEM): $(XSYSTEM_O) libx2sys.a
- $(CC) $(CFLAGS) $@.o -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS)
-+ @$(LIBTOOL) $(CC) $(CFLAGS) $@.lo -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS)
++ @$(LIBTOOL) $(CC) $(CFLAGS) $@.lo -o $@ libx2sys.la $(ALLLIB) $(LDFLAGS)
.c.o:
- $(CC) -c $(CFLAGS) $<