| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | $NetBSD: patch-ai,v 1.2 2017/06/07 14:45:31 ryoon Exp $ | | 1 | $NetBSD: patch-ai,v 1.3 2017/07/12 09:38:12 wiz Exp $ |
| 2 | | | 2 | |
| 3 | * PERL5LIB part: Fix build with Perl 5.26.0 | | 3 | * PERL5LIB part: Fix build with Perl 5.26.0 |
| 4 | | | 4 | |
| 5 | --- config/Makefile.SH.orig 2010-01-09 17:59:48.000000000 +0000 | | 5 | --- config/Makefile.SH.orig 2010-01-09 17:59:48.000000000 +0000 |
| 6 | +++ config/Makefile.SH | | 6 | +++ config/Makefile.SH |
| 7 | @@ -70,7 +70,7 @@ plotrunpath= | | 7 | @@ -70,7 +70,7 @@ plotrunpath= |
| 8 | case "$which_graphic_lib" in | | 8 | case "$which_graphic_lib" in |
| 9 | *X11*) | | 9 | *X11*) |
| 10 | PLOTCFLAGS="$PLOTCFLAGS $X11_INC" | | 10 | PLOTCFLAGS="$PLOTCFLAGS $X11_INC" |
| 11 | - PLOTLIBS="$PLOTLIBS $X11_LIBS" | | 11 | - PLOTLIBS="$PLOTLIBS $X11_LIBS" |
| 12 | + PLOTLIBS="-Wl,-R${X11BASE}/lib $PLOTLIBS $X11_LIBS" | | 12 | + PLOTLIBS="-Wl,-R${X11BASE}/lib $PLOTLIBS $X11_LIBS" |
| 13 | plotrunpath=$X11 | | 13 | plotrunpath=$X11 |
| 14 | graph="plotX $graph" | | 14 | graph="plotX $graph" |
| @@ -41,27 +41,27 @@ $NetBSD: patch-ai,v 1.2 2017/06/07 14:45 | | | @@ -41,27 +41,27 @@ $NetBSD: patch-ai,v 1.2 2017/06/07 14:45 |
| 41 | CPPFLAGS="-I. -I$src/headers" | | 41 | CPPFLAGS="-I. -I$src/headers" |
| 42 | if test "$has_dlopen" = builtin; then | | 42 | if test "$has_dlopen" = builtin; then |
| 43 | @@ -153,16 +140,14 @@ AR = ar | | 43 | @@ -153,16 +140,14 @@ AR = ar |
| 44 | SIZEOF_LONG= $sizeof_long | | 44 | SIZEOF_LONG= $sizeof_long |
| 45 | | | 45 | |
| 46 | CC_FLAVOR = | | 46 | CC_FLAVOR = |
| 47 | -CC = $CC \$(CC_FLAVOR) | | 47 | -CC = $CC \$(CC_FLAVOR) |
| 48 | +CC = \$(LIBTOOL) --mode=compile $CC \$(CC_FLAVOR) | | 48 | +CC = \$(LIBTOOL) --mode=compile $CC \$(CC_FLAVOR) |
| 49 | CPPFLAGS = $CPPFLAGS | | 49 | CPPFLAGS = $CPPFLAGS |
| 50 | CFLAGS = $CFLAGS | | 50 | CFLAGS = $CFLAGS |
| 51 | DLCFLAGS = $DLCFLAGS | | 51 | DLCFLAGS = $DLCFLAGS |
| 52 | LD_FLAVOR = \$(CC_FLAVOR) | | 52 | LD_FLAVOR = \$(CC_FLAVOR) |
| 53 | -LD = $LD \$(LD_FLAVOR) | | 53 | -LD = $LD \$(LD_FLAVOR) |
| 54 | +LD = \$(LIBTOOL) --mode=link $LD \$(LD_FLAVOR) | | 54 | +LD = \$(LIBTOOL) --mode=link $LD \$(LDFLAGS) \$(LD_FLAVOR) |
| 55 | LDFLAGS = $LDFLAGS | | 55 | LDFLAGS = $LDFLAGS |
| 56 | DLLD_FLAVOR = \$(LD_FLAVOR) | | 56 | DLLD_FLAVOR = \$(LD_FLAVOR) |
| 57 | -DLLD = $DLLD \$(DLLD_FLAVOR) | | 57 | -DLLD = $DLLD \$(DLLD_FLAVOR) |
| 58 | -DLLDFLAGS = $DLLDFLAGS | | 58 | -DLLDFLAGS = $DLLDFLAGS |
| 59 | EXTRADLLDFLAGS = $EXTRADLLDFLAGS | | 59 | EXTRADLLDFLAGS = $EXTRADLLDFLAGS |
| 60 | | | 60 | |
| 61 | # HIGHLY EXPERIMENTAL (only tested with gmp-4.0 on ix86 and Ultra). | | 61 | # HIGHLY EXPERIMENTAL (only tested with gmp-4.0 on ix86 and Ultra). |
| 62 | @@ -179,29 +164,19 @@ EXTRADLLDFLAGS = $EXTRADLLDFLAGS | | 62 | @@ -179,29 +164,19 @@ EXTRADLLDFLAGS = $EXTRADLLDFLAGS |
| 63 | #the following line | | 63 | #the following line |
| 64 | #GMPO2 = \$(GMP)/sparcv9.o | | 64 | #GMPO2 = \$(GMP)/sparcv9.o |
| 65 | | | 65 | |
| 66 | -_O = .o | | 66 | -_O = .o |
| 67 | -_A = .a | | 67 | -_A = .a |
| @@ -118,27 +118,27 @@ $NetBSD: patch-ai,v 1.2 2017/06/07 14:45 | | | @@ -118,27 +118,27 @@ $NetBSD: patch-ai,v 1.2 2017/06/07 14:45 |
| 118 | OBJS = $OBJS | | 118 | OBJS = $OBJS |
| 119 | OBJSGP = $OBJSGP | | 119 | OBJSGP = $OBJSGP |
| 120 | | | 120 | |
| 121 | -gp: gp-$dft ../gp$suffix$exe_suff $libdft | | 121 | -gp: gp-$dft ../gp$suffix$exe_suff $libdft |
| 122 | +all: \$(LIBPARI) | | 122 | +all: \$(LIBPARI) |
| 123 | | | 123 | |
| 124 | -../gp$suffix$exe_suff: gp-$dft | | 124 | -../gp$suffix$exe_suff: gp-$dft |
| 125 | - -\$(RM) \$@ | | 125 | - -\$(RM) \$@ |
| 126 | - -\$(LN) $ln_objdir/gp-$dft$exe_suff \$@ | | 126 | - -\$(LN) $ln_objdir/gp-$dft$exe_suff \$@ |
| 127 | +lib: \$(LIBPARI) | | 127 | +lib: \$(LIBPARI) |
| 128 | | | 128 | |
| 129 | -all: $exec lib-sta | | 129 | -all: $exec lib-sta |
| 130 | +\$(LIBPARI): \$(OBJS) | | 130 | +\$(LIBPARI): \$(OBJS) |
| 131 | + \$(LD) -o \$@ \$(OBJS) -rpath \$(LIBDIR) --version-info 0:0 | | 131 | + \$(LD) $(LDFLAGS) -o \$@ \$(OBJS) -rpath \$(LIBDIR) --version-info 0:0 |
| 132 | | | 132 | |
| 133 | -lib-sta: \$(LIBPARI_STA) | | 133 | -lib-sta: \$(LIBPARI_STA) |
| 134 | -lib-dyn: \$(LIBPARI_DYN) | | 134 | -lib-dyn: \$(LIBPARI_DYN) |
| 135 | - | | 135 | - |
| 136 | -\$(LIBPARI_STA): $add_funclist \$(OBJS) | | 136 | -\$(LIBPARI_STA): $add_funclist \$(OBJS) |
| 137 | - -\$(RM) \$@ | | 137 | - -\$(RM) \$@ |
| 138 | - \$(AR) r \$@ \$(OBJS) | | 138 | - \$(AR) r \$@ \$(OBJS) |
| 139 | - -$ranlib \$@ | | 139 | - -$ranlib \$@ |
| 140 | +gp: \$(OBJSGP) \$(LIBPARI) | | 140 | +gp: \$(OBJSGP) \$(LIBPARI) |
| 141 | + \$(RM) \$@ | | 141 | + \$(RM) \$@ |
| 142 | + \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI) | | 142 | + \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI) |
| 143 | | | 143 | |
| 144 | kerntest\$(_O): $src/test/kerntest.c | | 144 | kerntest\$(_O): $src/test/kerntest.c |