Fix gp linking to not include the temporary DESTDIR. Bump revision.diff -r1.67 -r1.68 pkgsrc/math/pari/Makefile
(joerg)
@@ -1,16 +1,17 @@ | @@ -1,16 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.67 2016/03/03 13:28:22 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.68 2016/05/07 10:03:25 joerg Exp $ | |
2 | 2 | |||
3 | DISTNAME= pari-2.7.5 | 3 | DISTNAME= pari-2.7.5 | |
4 | PKGREVISION= 1 | |||
4 | CATEGORIES= math | 5 | CATEGORIES= math | |
5 | MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/ | 6 | MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/ | |
6 | 7 | |||
7 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
8 | HOMEPAGE= http://pari.math.u-bordeaux.fr/ | 9 | HOMEPAGE= http://pari.math.u-bordeaux.fr/ | |
9 | COMMENT= Software package for computer-aided number theory | 10 | COMMENT= Software package for computer-aided number theory | |
10 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
11 | 12 | |||
12 | MAKE_JOBS_SAFE= no | 13 | MAKE_JOBS_SAFE= no | |
13 | 14 | |||
14 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
15 | USE_TOOLS+= gmake perl:run | 16 | USE_TOOLS+= gmake perl:run | |
16 | USE_LANGUAGES+= c c++ | 17 | USE_LANGUAGES+= c c++ |
@@ -1,22 +1,22 @@ | @@ -1,22 +1,22 @@ | |||
1 | $NetBSD: distinfo,v 1.24 2016/03/03 13:28:22 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.25 2016/05/07 10:03:25 joerg Exp $ | |
2 | 2 | |||
3 | SHA1 (pari-2.7.5.tar.gz) = ca6f6bc57d2028df5a5bddd3810a82cb05d139f2 | 3 | SHA1 (pari-2.7.5.tar.gz) = ca6f6bc57d2028df5a5bddd3810a82cb05d139f2 | |
4 | RMD160 (pari-2.7.5.tar.gz) = b5cc28e5382cc31d7da7dcb9258a7099d31872ce | 4 | RMD160 (pari-2.7.5.tar.gz) = b5cc28e5382cc31d7da7dcb9258a7099d31872ce | |
5 | SHA512 (pari-2.7.5.tar.gz) = 1dcc60d3b9ab6b46fd8e5d0e28e5e37369da0eb872869788b6ac7f92ce69a21789c114cd432cf8416014e4359db5c23816b49a26ad59965f51092d30b8af9d41 | 5 | SHA512 (pari-2.7.5.tar.gz) = 1dcc60d3b9ab6b46fd8e5d0e28e5e37369da0eb872869788b6ac7f92ce69a21789c114cd432cf8416014e4359db5c23816b49a26ad59965f51092d30b8af9d41 | |
6 | Size (pari-2.7.5.tar.gz) = 3159103 bytes | 6 | Size (pari-2.7.5.tar.gz) = 3159103 bytes | |
7 | SHA1 (patch-Configure) = b8f86c8111709e09616383dedeb9dda8fd098157 | 7 | SHA1 (patch-Configure) = b8f86c8111709e09616383dedeb9dda8fd098157 | |
8 | SHA1 (patch-config_DOC__Make.SH) = 088e1b0ff98a42ed50ef90fae87e3a7989239dea | 8 | SHA1 (patch-config_DOC__Make.SH) = 088e1b0ff98a42ed50ef90fae87e3a7989239dea | |
9 | SHA1 (patch-config_Makefile.SH) = d1754104438aa0a4d6f86c809d81300ecb3aa3f2 | 9 | SHA1 (patch-config_Makefile.SH) = 1b653ec4b506637e5e63b63ec58035912749bef4 | |
10 | SHA1 (patch-config_TOP__Make.SH) = 82e39e82660fbe94b304e4691f0598b8f28a856a | 10 | SHA1 (patch-config_TOP__Make.SH) = 82e39e82660fbe94b304e4691f0598b8f28a856a | |
11 | SHA1 (patch-config_get__PATH) = 3b7bae3610a3c7a51afd27f2610aa71169a2bc44 | 11 | SHA1 (patch-config_get__PATH) = 3b7bae3610a3c7a51afd27f2610aa71169a2bc44 | |
12 | SHA1 (patch-config_get__X11) = 0bb8f77d5c5adfb29f89ad95ead1b5726c1a3918 | 12 | SHA1 (patch-config_get__X11) = 0bb8f77d5c5adfb29f89ad95ead1b5726c1a3918 | |
13 | SHA1 (patch-config_get__archos) = f813a841f4795df30ef0b908263bea3d90e42b86 | 13 | SHA1 (patch-config_get__archos) = f813a841f4795df30ef0b908263bea3d90e42b86 | |
14 | SHA1 (patch-config_get__dlld) = 2e356255cb84d43f9859a66907bf8ed335639d78 | 14 | SHA1 (patch-config_get__dlld) = 2e356255cb84d43f9859a66907bf8ed335639d78 | |
15 | SHA1 (patch-config_get__install) = 0cccbb2dcf875b287787d88265730fdbeb5abd42 | 15 | SHA1 (patch-config_get__install) = 0cccbb2dcf875b287787d88265730fdbeb5abd42 | |
16 | SHA1 (patch-config_get__ld) = 3a0539211311c2686f3c8b1b289038ad54397134 | 16 | SHA1 (patch-config_get__ld) = 3a0539211311c2686f3c8b1b289038ad54397134 | |
17 | SHA1 (patch-config_get__libpth) = dc9e0178f41125396d51663e02f221fa95f24343 | 17 | SHA1 (patch-config_get__libpth) = dc9e0178f41125396d51663e02f221fa95f24343 | |
18 | SHA1 (patch-src_headers_paridecl.h) = 996c1d0d0fcf1a1070699cd46a10def8901718ee | 18 | SHA1 (patch-src_headers_paridecl.h) = 996c1d0d0fcf1a1070699cd46a10def8901718ee | |
19 | SHA1 (patch-src_headers_paristio.h) = dd37ba9c6882a72e0d78d28eaaa00e7e18803111 | 19 | SHA1 (patch-src_headers_paristio.h) = dd37ba9c6882a72e0d78d28eaaa00e7e18803111 | |
20 | SHA1 (patch-src_language_anal.c) = 4570cd7fdd0c0d135391630bf0f6612a22ceaea8 | 20 | SHA1 (patch-src_language_anal.c) = 4570cd7fdd0c0d135391630bf0f6612a22ceaea8 | |
21 | SHA1 (patch-src_language_compile.c) = ea356968c3e5f8d599a61d4413bf04552b673ea6 | 21 | SHA1 (patch-src_language_compile.c) = ea356968c3e5f8d599a61d4413bf04552b673ea6 | |
22 | SHA1 (patch-src_language_es.c) = ee470a5e050839573e213d7644d1e182fb3a4f0f | 22 | SHA1 (patch-src_language_es.c) = ee470a5e050839573e213d7644d1e182fb3a4f0f |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-config_Makefile.SH,v 1.1 2016/03/03 13:28:22 wiz Exp $ | 1 | $NetBSD: patch-config_Makefile.SH,v 1.2 2016/05/07 10:03:25 joerg Exp $ | |
2 | 2 | |||
3 | --- config/Makefile.SH.orig 2014-12-13 20:52:52.000000000 +0000 | 3 | --- config/Makefile.SH.orig 2014-12-13 20:52:52.000000000 +0000 | |
4 | +++ config/Makefile.SH | 4 | +++ config/Makefile.SH | |
5 | @@ -52,8 +52,6 @@ case "$osname" in | 5 | @@ -52,8 +52,6 @@ case "$osname" in | |
6 | dlld_ignore=- ;; | 6 | dlld_ignore=- ;; | |
7 | mingw) | 7 | mingw) | |
8 | export_file='$(LIBPARI).def';; | 8 | export_file='$(LIBPARI).def';; | |
9 | - darwin) | 9 | - darwin) | |
10 | - ld_install_name="-Wl,-install_name -Wl,\"$libdir\"/\$(LIBPARI_DYN)";; | 10 | - ld_install_name="-Wl,-install_name -Wl,\"$libdir\"/\$(LIBPARI_DYN)";; | |
11 | esac | 11 | esac | |
12 | case "$osname" in | 12 | case "$osname" in | |
13 | mingw|cygwin) | 13 | mingw|cygwin) | |
14 | @@ -93,7 +91,7 @@ plotrunpath= | 14 | @@ -93,7 +91,7 @@ plotrunpath= | |
@@ -99,27 +99,27 @@ $NetBSD: patch-config_Makefile.SH,v 1.1 | @@ -99,27 +99,27 @@ $NetBSD: patch-config_Makefile.SH,v 1.1 | |||
99 | + \$(RM) \$@ | 99 | + \$(RM) \$@ | |
100 | + \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI) | 100 | + \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI) | |
101 | 101 | |||
102 | -lib-sta: \$(LIBPARI_STA) | 102 | -lib-sta: \$(LIBPARI_STA) | |
103 | -lib-dyn: \$(LIBPARI_DYN) | 103 | -lib-dyn: \$(LIBPARI_DYN) | |
104 | +all: gp \$(LIBPARI) | 104 | +all: gp \$(LIBPARI) | |
105 | +lib: \$(LIBPARI) | 105 | +lib: \$(LIBPARI) | |
106 | 106 | |||
107 | -\$(LIBPARI_STA): $add_funclist \$(OBJS) | 107 | -\$(LIBPARI_STA): $add_funclist \$(OBJS) | |
108 | - -\$(RM) \$@ | 108 | - -\$(RM) \$@ | |
109 | - \$(AR) r \$@ \$(OBJS) | 109 | - \$(AR) r \$@ \$(OBJS) | |
110 | - -\$(RANLIB) \$@ | 110 | - -\$(RANLIB) \$@ | |
111 | +\$(LIBPARI): \$(OBJS) | 111 | +\$(LIBPARI): \$(OBJS) | |
112 | + \$(LD) -o \$@ \$(OBJS) -rpath \$(LIBDIR) \$(GMPLIBS) --version-info 0:0 | 112 | + \$(LD) -o \$@ \$(OBJS) -rpath \$(PREFIX)/lib \$(GMPLIBS) --version-info 0:0 | |
113 | 113 | |||
114 | kerntest\$(_O): $src/test/kerntest.c | 114 | kerntest\$(_O): $src/test/kerntest.c | |
115 | \$(CC) -c -I$src/language \$(CPPFLAGS) \$(CFLAGS) -o \$@ $src/test/kerntest.c | 115 | \$(CC) -c -I$src/language \$(CPPFLAGS) \$(CFLAGS) -o \$@ $src/test/kerntest.c | |
116 | @@ -335,11 +312,6 @@ tune-dyn: tune\$(_O) \$(LIBPARI_DYN) | 116 | @@ -335,11 +312,6 @@ tune-dyn: tune\$(_O) \$(LIBPARI_DYN) | |
117 | tune-sta: tune\$(_O) \$(LIBPARI_STA) | 117 | tune-sta: tune\$(_O) \$(LIBPARI_STA) | |
118 | \$(LD) \$(LDFLAGS) \$(RUNPTH) -o \$@ \$< \$(GMPOBJS) ./\$(LIBPARI_STA) \$(STA_LIBS) | 118 | \$(LD) \$(LDFLAGS) \$(RUNPTH) -o \$@ \$< \$(GMPOBJS) ./\$(LIBPARI_STA) \$(STA_LIBS) | |
119 | 119 | |||
120 | -gp-sta: $add_funclist \$(OBJS) \$(OBJSGP) | 120 | -gp-sta: $add_funclist \$(OBJS) \$(OBJSGP) | |
121 | - \$(RM) \$@ | 121 | - \$(RM) \$@ | |
122 | - \$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(STA_LIBS) | 122 | - \$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(STA_LIBS) | |
123 | - $postconfig gp-sta | 123 | - $postconfig gp-sta | |
124 | - | 124 | - | |
125 | cleantest: | 125 | cleantest: |