diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-06-21 20:41:20 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-06-21 20:41:20 +0000 |
| commit | a8cf85cdd61e22cbc629a45e88cc7995263191b6 (patch) | |
| tree | 65af8d3529da6462724ed49655f1ecc9c95ca65e | |
| parent | d702e0e62f9abcacb5b4c2c03ce53fa129b32380 (diff) | |
| download | netpbm-mirror-a8cf85cdd61e22cbc629a45e88cc7995263191b6.tar.gz netpbm-mirror-a8cf85cdd61e22cbc629a45e88cc7995263191b6.tar.xz netpbm-mirror-a8cf85cdd61e22cbc629a45e88cc7995263191b6.zip | |
Release 10.47.38
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1696 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rwxr-xr-x | buildtools/configure.pl | 6 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 7 | ||||
| -rw-r--r-- | version.mk | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/buildtools/configure.pl b/buildtools/configure.pl index dd08511f..edd7b865 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -1133,7 +1133,9 @@ sub getLinuxsvgaLibrary($@) { $default = '/usr/link/svgalib/libvga.so'; } elsif (-d('/usr/lib/svgalib')) { $default = '/usr/lib/svgalib/libvga.so'; - } elsif (system('ldconfig -p | grep libvga &>/dev/null') == 0) { + } elsif (system('ldconfig -p | grep libvga >/dev/null 2>&1') == 0) { + # &>/dev/null should work above, but on 12.03.26, it caused the + # return value of system() always to be zero! $default = 'libvga.so'; } else { $default = 'none'; @@ -2208,7 +2210,7 @@ if (!$flex_result) { # make rules for Thinkjettopbm for information on our experiences # with Lexes besides Flex. - my $systemRc = system('lex </dev/null &>/dev/null'); + my $systemRc = system('lex </dev/null >/dev/null 2>&1'); if ($systemRc >> 8 == 127) { print("\n"); diff --git a/common.mk b/common.mk index 9e13a7c8..a74074de 100644 --- a/common.mk +++ b/common.mk @@ -336,7 +336,7 @@ $(PORTBINARIES) $(MATHBINARIES): %: %.o $(NETPBMLIB) $(LIBOPT) # Note that LDFLAGS might contain -L options, so order is important. # LDFLAGS is commonly set as an environment variable. $(LD) -o $@ $@.o $(MATHLIB) $(shell $(LIBOPT) $(NETPBMLIB)) \ - $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) + $(LDFLAGS) $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD) # MERGE STUFF diff --git a/doc/HISTORY b/doc/HISTORY index 7a2872f0..aff9fc37 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,13 @@ Netpbm. CHANGE HISTORY -------------- +12.06.21 BJH Release 10.47.38 + + configure: work around Perl bug that causes 'configure' to + falsely conclude Svgalib is installed. + + Build: move -lm to end of -l's. Broken at least since 10.35. + 12.02.15 BJH Release 10.47.37 Fix compile error from 10.47.36. diff --git a/version.mk b/version.mk index 1164b3c8..aa24bb86 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 47 -NETPBM_POINT_RELEASE = 37 +NETPBM_POINT_RELEASE = 38 |