Thu Aug 13 18:30:51 2020 UTC ()
openjade: linking requires CXX, not CC


(adam)
diff -r1.19 -r1.20 pkgsrc/textproc/openjade/distinfo
diff -r1.5 -r1.6 pkgsrc/textproc/openjade/patches/patch-ab
cvs diff -r1.19 -r1.20 pkgsrc/textproc/openjade/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/openjade/distinfo 2020/07/31 17:01:44 1.19
+++ pkgsrc/textproc/openjade/distinfo 2020/08/13 18:30:51 1.20
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.19 2020/07/31 17:01:44 brook Exp $ 1$NetBSD: distinfo,v 1.20 2020/08/13 18:30:51 adam Exp $
2 2
3SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321 3SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321
4RMD160 (openjade-1.3.2.tar.gz) = 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 4RMD160 (openjade-1.3.2.tar.gz) = 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2
5SHA512 (openjade-1.3.2.tar.gz) = c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1 5SHA512 (openjade-1.3.2.tar.gz) = c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
6Size (openjade-1.3.2.tar.gz) = 894834 bytes 6Size (openjade-1.3.2.tar.gz) = 894834 bytes
7SHA1 (patch-Makefile.comm.in) = 79ece1241a42e99eae8130be30adef42bc7bad84 7SHA1 (patch-Makefile.comm.in) = 79ece1241a42e99eae8130be30adef42bc7bad84
8SHA1 (patch-aa) = cf55d4812e9bd5592ceb71e972c62c10de1bd02c 8SHA1 (patch-aa) = cf55d4812e9bd5592ceb71e972c62c10de1bd02c
9SHA1 (patch-ab) = 7f54b7b2e52da456b673c9f0f539d03ef0850e81 9SHA1 (patch-ab) = 0389963a0bec691d6a8eb6314295a6523487a166
10SHA1 (patch-ac) = 2492ccb9bd736318ecd5c37f1b2a963f3ff188ab 10SHA1 (patch-ac) = 2492ccb9bd736318ecd5c37f1b2a963f3ff188ab
11SHA1 (patch-ad) = f8c950cc4a0ffb5bdba315a298c14a3e7ebcd637 11SHA1 (patch-ad) = f8c950cc4a0ffb5bdba315a298c14a3e7ebcd637
12SHA1 (patch-ae) = b67fde4062691b2d953cb4cb5b4ebd2428c3c285 12SHA1 (patch-ae) = b67fde4062691b2d953cb4cb5b4ebd2428c3c285
13SHA1 (patch-af) = 1e0db04b5b85ad3b71066e55f94bf3144d69efe5 13SHA1 (patch-af) = 1e0db04b5b85ad3b71066e55f94bf3144d69efe5
14SHA1 (patch-jade_HtmlFOTBuilder.cxx) = 98643b1159b6f22ae8e77ac3e8c5f431c167ce83 14SHA1 (patch-jade_HtmlFOTBuilder.cxx) = 98643b1159b6f22ae8e77ac3e8c5f431c167ce83
15SHA1 (patch-jade_TeXFOTBuilder.cxx) = 037953d73d896afae7531e313821224ccd1e30e4 15SHA1 (patch-jade_TeXFOTBuilder.cxx) = 037953d73d896afae7531e313821224ccd1e30e4
16SHA1 (patch-jade_TransformFOTBuilder.cxx) = cf4c51f05f95e31111a7e48d7984397ba4850e7d 16SHA1 (patch-jade_TransformFOTBuilder.cxx) = cf4c51f05f95e31111a7e48d7984397ba4850e7d
17SHA1 (patch-msggen.pl) = d55befeb6f859c9c3330c2083fce5d5281a496ef 17SHA1 (patch-msggen.pl) = d55befeb6f859c9c3330c2083fce5d5281a496ef
18SHA1 (patch-style_Collector.h) = b07289e9b2011f8059c68794aee803b0f278fd3f 18SHA1 (patch-style_Collector.h) = b07289e9b2011f8059c68794aee803b0f278fd3f
19SHA1 (patch-style_primitive.cxx) = a7f3328c436c9a73805cdd1abb4321f156b94c6e 19SHA1 (patch-style_primitive.cxx) = a7f3328c436c9a73805cdd1abb4321f156b94c6e
cvs diff -r1.5 -r1.6 pkgsrc/textproc/openjade/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/textproc/openjade/patches/patch-ab 2020/07/31 17:01:44 1.5
+++ pkgsrc/textproc/openjade/patches/patch-ab 2020/08/13 18:30:51 1.6
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ab,v 1.5 2020/07/31 17:01:44 brook Exp $ 1$NetBSD: patch-ab,v 1.6 2020/08/13 18:30:51 adam Exp $
2 2
3Use --tag explicitly to always detect the correct compiler. See 3Use --tag explicitly to always detect the correct compiler. See
4https://sourceforge.net/p/openjade/patches/48/ 4https://sourceforge.net/p/openjade/patches/48/
5 5
6Include $(LDFLAGS) in linker arguments. 6Include $(LDFLAGS) in linker arguments.
7 7
8--- Makefile.lib.in.orig 2002-01-22 11:57:53.000000000 +0000 8--- Makefile.lib.in.orig 2002-01-22 11:57:53.000000000 +0000
9+++ Makefile.lib.in 9+++ Makefile.lib.in
10@@ -23,7 +23,7 @@ Makefile.lt: 10@@ -23,7 +23,7 @@ Makefile.lt:
11 echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt 11 echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt
12  12
13 lib$(LIB).la: $(LT_OBJS) 13 lib$(LIB).la: $(LT_OBJS)
14- $(LIBTOOL) --mode=link $(CC) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \ 14- $(LIBTOOL) --mode=link $(CC) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
15+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LINKFLAGS) $(LDFLAGS) -o lib$(LIB).la $(LT_OBJS) \ 15+ $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(LINKFLAGS) $(LDFLAGS) -o lib$(LIB).la $(LT_OBJS) \
16 -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS) 16 -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
17  17
18 install: 18 install: